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

core: Remove experimental feature GPGME_EXPORT_MODE_NOUID.

Browse Source 
* src/export.c (export_start): Remove GPGME_EXPORT_MODE_NOUID check.
* src/engine-gpg.c (export_common): Ditto.
--

Note that this constant was never announed and used only for internal
tests.  It made it into some release only by accident.

The constants is kept in gpgme.h to not break any code but it is
non-fucntionals.  We do not consider this an ABI break.

GnuPG-bug-id: 5284
This commit is contained in:
Werner Koch 2021-02-01 16:47:46 +01:00
parent 13221933ed
commit c8fd8870b3
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/engine-gpg.c
View File

@ -2336,13 +2336,8 @@ export_common (engine_gpg_t gpg, gpgme_export_mode_t mode,
if ((mode & GPGME_EXPORT_MODE_MINIMAL)) if ((mode & GPGME_EXPORT_MODE_MINIMAL))
{ {
if ((mode & GPGME_EXPORT_MODE_NOUID))
err = add_arg (gpg, "--export-options=export-minimal,export-drop-uids");
else
err = add_arg (gpg, "--export-options=export-minimal"); err = add_arg (gpg, "--export-options=export-minimal");
} }
else if ((mode & GPGME_EXPORT_MODE_NOUID))
err = add_arg (gpg, "--export-options=export-drop-uids");
if (err) if (err)
; ;
@ -2358,8 +2353,6 @@ export_common (engine_gpg_t gpg, gpgme_export_mode_t mode,
else if ((mode & GPGME_EXPORT_MODE_EXTERN)) else if ((mode & GPGME_EXPORT_MODE_EXTERN))
{ {
err = add_arg (gpg, "--send-keys"); err = add_arg (gpg, "--send-keys");
if (!err && (mode & GPGME_EXPORT_MODE_NOUID))
err = add_arg (gpg, "--keyserver-options=export-drop-uids");
} }
else else
{ {

1
src/export.c
View File

@ -129,7 +129,6 @@ export_start (gpgme_ctx_t ctx, int synchronous, const char *pattern,
|GPGME_EXPORT_MODE_SECRET |GPGME_EXPORT_MODE_SECRET
|GPGME_EXPORT_MODE_SSH |GPGME_EXPORT_MODE_SSH
|GPGME_EXPORT_MODE_RAW |GPGME_EXPORT_MODE_RAW
|GPGME_EXPORT_MODE_NOUID
|GPGME_EXPORT_MODE_PKCS12))) |GPGME_EXPORT_MODE_PKCS12)))
return gpg_error (GPG_ERR_INV_VALUE); /* Invalid flags in MODE. */ return gpg_error (GPG_ERR_INV_VALUE); /* Invalid flags in MODE. */

6
src/gpgme.h.in
View File

@ -406,7 +406,6 @@ gpgme_pinentry_mode_t;
#define GPGME_EXPORT_MODE_SECRET 16 #define GPGME_EXPORT_MODE_SECRET 16
#define GPGME_EXPORT_MODE_RAW 32 #define GPGME_EXPORT_MODE_RAW 32
#define GPGME_EXPORT_MODE_PKCS12 64 #define GPGME_EXPORT_MODE_PKCS12 64
#define GPGME_EXPORT_MODE_NOUID 128 /* Experimental(!)*/
#define GPGME_EXPORT_MODE_SSH 256 #define GPGME_EXPORT_MODE_SSH 256
typedef unsigned int gpgme_export_mode_t; typedef unsigned int gpgme_export_mode_t;
@ -2463,6 +2462,11 @@ char *gpgme_addrspec_from_uid (const char *uid);
* Deprecated types, constants and functions. * Deprecated types, constants and functions.
*/ */
/* This is a former experimental only features. The constant is
* provided to not break existing code in the compiler phase. */
#define GPGME_EXPORT_MODE_NOUID 128 /* Do not use! */
/* The possible stati for gpgme_op_edit. The use of that function and /* The possible stati for gpgme_op_edit. The use of that function and
* these status codes are deprecated in favor of gpgme_op_interact. */ * these status codes are deprecated in favor of gpgme_op_interact. */
typedef enum typedef enum