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

core: Remove stub to try implementing gpg < 2.1 support for createkey.

Browse Source 
* src/engine-gpg.c (gpg_createkey_legacy): Remove.
(gpg_genkey): Remove call.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-09-16 11:45:07 +02:00
parent 1f9641dd0f
commit 268e251b80
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/engine-gpg.c
View File

@ -2051,25 +2051,6 @@ gpg_createkey_from_param (engine_gpg_t gpg,
} }
/* This is used for gpg versions which do not support the quick-genkey
* command to emulate the gpgme_op_createkey API. */
static gpgme_error_t
gpg_createkey_legacy (engine_gpg_t gpg,
const char *userid, const char *algo,
unsigned long expires,
unsigned int flags,
unsigned int extraflags)
{
(void)gpg;
(void)userid;
(void)algo;
(void)expires;
(void)flags;
(void)extraflags;
return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
}
static gpgme_error_t static gpgme_error_t
gpg_createkey (engine_gpg_t gpg, gpg_createkey (engine_gpg_t gpg,
const char *userid, const char *algo, const char *userid, const char *algo,
@ -2204,16 +2185,10 @@ gpg_genkey (void *engine,
else else
err = gpg_createkey_from_param (gpg, help_data, extraflags); err = gpg_createkey_from_param (gpg, help_data, extraflags);
} }
else if (userid && !key)
{
if (!have_gpg_version (gpg, "2.1.13"))
err = gpg_createkey_legacy (gpg, userid, algo, expires, flags,
extraflags);
else
err = gpg_createkey (gpg, userid, algo, expires, flags, extraflags);
}
else if (!have_gpg_version (gpg, "2.1.13")) else if (!have_gpg_version (gpg, "2.1.13"))
err = gpg_error (GPG_ERR_NOT_SUPPORTED); err = gpg_error (GPG_ERR_NOT_SUPPORTED);
else if (userid && !key)
err = gpg_createkey (gpg, userid, algo, expires, flags, extraflags);
else if (!userid && key) else if (!userid && key)
err = gpg_addkey (gpg, algo, expires, key, flags, extraflags); err = gpg_addkey (gpg, algo, expires, key, flags, extraflags);
else if (userid && key && !algo) else if (userid && key && !algo)