From c22f5884c50557f54704f4becc5a8c1ee0749547 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 14 Sep 2016 12:15:35 +0200 Subject: core: Change a parameter for the engine's genkey function. * src/engine.h (GENKEY_EXTRAFLAG_ARMOR): New. * src/engine-backend.h (engine_ops): Rename USE_ARMOR in genkey to EXTRAFLAGS. * src/engine.c (_gpgme_engine_op_genkey): Ditto. * src/engine-gpg.c (gpg_createkey_from_param): Ditto and test the flags. (gpg_createkey_legacy): Ditto. (gpg_createkey): Ditto. (gpg_addkey): Ditto. (gpg_genkey): Ditto. Signed-off-by: Werner Koch --- src/engine-gpgsm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/engine-gpgsm.c') diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c index 0610c7a7..071626a9 100644 --- a/src/engine-gpgsm.c +++ b/src/engine-gpgsm.c @@ -1447,7 +1447,7 @@ gpgsm_genkey (void *engine, const char *userid, const char *algo, unsigned long reserved, unsigned long expires, gpgme_key_t key, unsigned int flags, - gpgme_data_t help_data, int use_armor, + gpgme_data_t help_data, unsigned int extraflags, gpgme_data_t pubkey, gpgme_data_t seckey) { engine_gpgsm_t gpgsm = engine; @@ -1468,7 +1468,8 @@ gpgsm_genkey (void *engine, if (err) return err; gpgsm->output_cb.data = pubkey; - err = gpgsm_set_fd (gpgsm, OUTPUT_FD, use_armor ? "--armor" + err = gpgsm_set_fd (gpgsm, OUTPUT_FD, + (extraflags & GENKEY_EXTRAFLAG_ARMOR)? "--armor" : map_data_enc (gpgsm->output_cb.data)); if (err) return err; -- cgit v1.2.3