[Pkg-gnupg-commit] [gpgme] 367/412: core: Remove stub to try implementing gpg < 2.1 support for createkey.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Thu Sep 22 21:27:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gpgme.
commit 268e251b802cc7c19831722d7e3a52777a0f412f
Author: Werner Koch <wk at gnupg.org>
Date: Fri Sep 16 11:45:07 2016 +0200
core: Remove stub to try implementing gpg < 2.1 support for createkey.
* src/engine-gpg.c (gpg_createkey_legacy): Remove.
(gpg_genkey): Remove call.
Signed-off-by: Werner Koch <wk at gnupg.org>
---
src/engine-gpg.c | 29 ++---------------------------
1 file changed, 2 insertions(+), 27 deletions(-)
diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index d2741cb..a7431d5 100644
--- a/src/engine-gpg.c
+++ b/src/engine-gpg.c
@@ -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
gpg_createkey (engine_gpg_t gpg,
const char *userid, const char *algo,
@@ -2204,16 +2185,10 @@ gpg_genkey (void *engine,
else
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"))
err = gpg_error (GPG_ERR_NOT_SUPPORTED);
+ else if (userid && !key)
+ err = gpg_createkey (gpg, userid, algo, expires, flags, extraflags);
else if (!userid && key)
err = gpg_addkey (gpg, algo, expires, key, flags, extraflags);
else if (userid && key && !algo)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git
More information about the Pkg-gnupg-commit
mailing list