diff options
| author | Werner Koch <[email protected]> | 2016-09-14 10:15:35 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-09-14 10:42:12 +0000 |
| commit | c22f5884c50557f54704f4becc5a8c1ee0749547 (patch) | |
| tree | 7bb96c1cc7b43662bc09cc3ef3ad53e74a302e17 /src/engine-gpgsm.c | |
| parent | python: Build for both Python2 and Python3. (diff) | |
| download | gpgme-c22f5884c50557f54704f4becc5a8c1ee0749547.tar.gz gpgme-c22f5884c50557f54704f4becc5a8c1ee0749547.zip | |
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 <[email protected]>
Diffstat (limited to 'src/engine-gpgsm.c')
| -rw-r--r-- | src/engine-gpgsm.c | 5 |
1 files changed, 3 insertions, 2 deletions
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; |