GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Update required GnuPG version for new archive features

Browse Source 
* src/engine-gpg.c (gpg_decrypt, gpg_encrypt, gpg_encrypt_sign,
gpg_sign, gpg_verify): Require gpg 2.4.1.

--

To work properly the archive feature needs a fix added in GnuPG 2.4.1.

GnuPG-bug-id: 6342
This commit is contained in:
Ingo Klöcker 2023-01-26 09:52:11 +01:00
parent ab7146aa61
commit 3580bb139b
No known key found for this signature in database
GPG Key ID: F5A5D1692277A1E9
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/gpgme.texi
View File

@ -5643,7 +5643,8 @@ shall exactly act as @code{gpgme_op_decrypt_verify}.
The @code{GPGME_DECRYPT_ARCHIVE} symbol specifies that the input is an The @code{GPGME_DECRYPT_ARCHIVE} symbol specifies that the input is an
encrypted archive that shall be decrypted and extracted. This feature encrypted archive that shall be decrypted and extracted. This feature
is currently only supported for the OpenPGP crypto engine. is currently only supported for the OpenPGP crypto engine and requires
GnuPG 2.4.1.
@item GPGME_DECRYPT_UNWRAP @item GPGME_DECRYPT_UNWRAP
@since{1.8.0} @since{1.8.0}
@ -5851,7 +5852,8 @@ multiple of the following bit values:
The @code{GPGME_VERIFY_ARCHIVE} symbol specifies that the input is a The @code{GPGME_VERIFY_ARCHIVE} symbol specifies that the input is a
signed archive that shall be verified and extracted. This feature signed archive that shall be verified and extracted. This feature
is currently only supported for the OpenPGP crypto engine. is currently only supported for the OpenPGP crypto engine and requires
GnuPG 2.4.1.
@end table @end table
@ -6315,7 +6317,8 @@ mode settings of the context are ignored.
@since{1.19.0} @since{1.19.0}
A signed archive is created from the given files and directories. This A signed archive is created from the given files and directories. This
feature is currently only supported for the OpenPGP crypto engine. feature is currently only supported for the OpenPGP crypto engine and requires
GnuPG 2.4.1.
@end table @end table
@end deftp @end deftp
@ -6594,7 +6597,7 @@ supported for the OpenPGP crypto engine.
The @code{GPGME_ENCRYPT_ARCHIVE} symbol specifies that the input is a The @code{GPGME_ENCRYPT_ARCHIVE} symbol specifies that the input is a
NUL-separated list of file paths and directory paths that shall be NUL-separated list of file paths and directory paths that shall be
encrypted into an archive. This feature is currently only supported encrypted into an archive. This feature is currently only supported
for the OpenPGP crypto engine. for the OpenPGP crypto engine and requires GnuPG 2.4.1.
@end table @end table

10
src/engine-gpg.c
View File

@ -1832,7 +1832,7 @@ gpg_decrypt (void *engine,
gpg->flags.use_gpgtar = !!(flags & GPGME_DECRYPT_ARCHIVE); gpg->flags.use_gpgtar = !!(flags & GPGME_DECRYPT_ARCHIVE);
if (gpg->flags.use_gpgtar && !have_gpg_version (gpg, "2.3.5")) if (gpg->flags.use_gpgtar && !have_gpg_version (gpg, "2.4.1"))
return gpg_error (GPG_ERR_NOT_SUPPORTED); return gpg_error (GPG_ERR_NOT_SUPPORTED);
if (gpg->flags.use_gpgtar && (flags & GPGME_DECRYPT_UNWRAP)) if (gpg->flags.use_gpgtar && (flags & GPGME_DECRYPT_UNWRAP))
@ -2334,7 +2334,7 @@ gpg_encrypt (void *engine, gpgme_key_t recp[], const char *recpstring,
gpg->flags.use_gpgtar = !!(flags & GPGME_ENCRYPT_ARCHIVE); gpg->flags.use_gpgtar = !!(flags & GPGME_ENCRYPT_ARCHIVE);
if (gpg->flags.use_gpgtar && !have_gpg_version (gpg, "2.3.5")) if (gpg->flags.use_gpgtar && !have_gpg_version (gpg, "2.4.1"))
return gpg_error (GPG_ERR_NOT_SUPPORTED); return gpg_error (GPG_ERR_NOT_SUPPORTED);
if (gpg->flags.use_gpgtar && (flags & GPGME_ENCRYPT_WRAP)) if (gpg->flags.use_gpgtar && (flags & GPGME_ENCRYPT_WRAP))
@ -2449,7 +2449,7 @@ gpg_encrypt_sign (void *engine, gpgme_key_t recp[],
gpg->flags.use_gpgtar = !!(flags & GPGME_ENCRYPT_ARCHIVE); gpg->flags.use_gpgtar = !!(flags & GPGME_ENCRYPT_ARCHIVE);
if (gpg->flags.use_gpgtar && !have_gpg_version (gpg, "2.3.5")) if (gpg->flags.use_gpgtar && !have_gpg_version (gpg, "2.4.1"))
return gpg_error (GPG_ERR_NOT_SUPPORTED); return gpg_error (GPG_ERR_NOT_SUPPORTED);
if (recp || recpstring) if (recp || recpstring)
@ -3590,7 +3590,7 @@ gpg_sign (void *engine, gpgme_data_t in, gpgme_data_t out,
gpg->flags.use_gpgtar = mode == GPGME_SIG_MODE_ARCHIVE; gpg->flags.use_gpgtar = mode == GPGME_SIG_MODE_ARCHIVE;
if (gpg->flags.use_gpgtar && !have_gpg_version (gpg, "2.3.5")) if (gpg->flags.use_gpgtar && !have_gpg_version (gpg, "2.4.1"))
return gpg_error (GPG_ERR_NOT_SUPPORTED); return gpg_error (GPG_ERR_NOT_SUPPORTED);
if (mode == GPGME_SIG_MODE_CLEAR) if (mode == GPGME_SIG_MODE_CLEAR)
@ -3674,7 +3674,7 @@ gpg_verify (void *engine, gpgme_verify_flags_t flags, gpgme_data_t sig,
gpg->flags.use_gpgtar = !!(flags & GPGME_VERIFY_ARCHIVE); gpg->flags.use_gpgtar = !!(flags & GPGME_VERIFY_ARCHIVE);
if (gpg->flags.use_gpgtar && !have_gpg_version (gpg, "2.3.5")) if (gpg->flags.use_gpgtar && !have_gpg_version (gpg, "2.4.1"))
return gpg_error (GPG_ERR_NOT_SUPPORTED); return gpg_error (GPG_ERR_NOT_SUPPORTED);
err = append_args_from_sender (gpg, ctx); err = append_args_from_sender (gpg, ctx);