diff options
author | Marcus Brinkmann <[email protected]> | 2002-02-08 22:43:44 +0000 |
---|---|---|
committer | Marcus Brinkmann <[email protected]> | 2002-02-08 22:43:44 +0000 |
commit | f0a45d0c20abe8bda33e275277da6d3cea434f49 (patch) | |
tree | 0f4c3f51a1348dd1f7cb2e5f7d8789d14127c2b1 /gpgme/engine.h | |
parent | 2002-02-08 Marcus Brinkmann <[email protected]> (diff) | |
download | gpgme-f0a45d0c20abe8bda33e275277da6d3cea434f49.tar.gz gpgme-f0a45d0c20abe8bda33e275277da6d3cea434f49.zip |
2002-02-08 Marcus Brinkmann <[email protected]>
* genkey.c (gpgme_op_genkey_start): Allow PUBKEY and SECKEY to be
set, and pass them down to the crypto engine.
* engine-gpgsm.h (_gpgme_gpgsm_start): New arguments PUBKEY and SECKEY.
* engine.h: Likewise.
* rungpg.h (_gpgme_gpg_spawn): Likewise.
* engine.c (_gpgme_engine_op_genkey): Likewise. Use those
arguments.
* rungpg.c (_gpgme_gpg_op_genkey): Likewise. Complain if those
arguments are set.
* engine-gpgsm.c (_gpgme_gpgsm_op_genkey): Likewise. Implement
function.
* engine-gpgsm.c (_gpgme_gpgsm_op_keylist): Beautify comment.
Diffstat (limited to '')
-rw-r--r-- | gpgme/engine.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gpgme/engine.h b/gpgme/engine.h index c7a83425..a9d373e6 100644 --- a/gpgme/engine.h +++ b/gpgme/engine.h @@ -1,6 +1,6 @@ /* engine.h - GPGME engine calling functions * Copyright (C) 2000 Werner Koch (dd9jn) - * Copyright (C) 2001 g10 Code GmbH + * Copyright (C) 2001, 2002 g10 Code GmbH * * This file is part of GPGME. * @@ -49,7 +49,8 @@ GpgmeError _gpgme_engine_op_encrypt (EngineObject engine, GpgmeRecipients recp, GpgmeError _gpgme_engine_op_export (EngineObject engine, GpgmeRecipients recp, GpgmeData keydata, int use_armor); GpgmeError _gpgme_engine_op_genkey (EngineObject engine, GpgmeData help_data, - int use_armor); + int use_armor, GpgmeData pubkey, + GpgmeData seckey); GpgmeError _gpgme_engine_op_import (EngineObject engine, GpgmeData keydata); GpgmeError _gpgme_engine_op_keylist (EngineObject engine, const char *pattern, int secret_only, |