diff options
| author | NIIBE Yutaka <[email protected]> | 2018-03-29 02:56:02 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2018-03-29 02:56:02 +0000 |
| commit | a1515b3bbc10a210040dda3b482bcdb933fa8d7c (patch) | |
| tree | b985f1f5090ea4f1edaf0d5366be97a61c665fd9 /g10/main.h | |
| parent | g10: check_pin_for_key_operation should be just before genkey. (diff) | |
| download | gnupg-a1515b3bbc10a210040dda3b482bcdb933fa8d7c.tar.gz gnupg-a1515b3bbc10a210040dda3b482bcdb933fa8d7c.zip | |
g10: Support key attribute change at --card-edit/generate.
* g10/card-util.c (ask_card_rsa_keysize): Drop support for magic
number 25519 for ed25519/cv25519. Rename from ask_card_keyattr.
(ask_card_keyattr): Support ECC, as well as RSA.
(do_change_keyattr): Support ECC dropping magical number 25519.
* g10/keygen.c (ask_curve): Allow call from outside, adding last arg
of CURRENT.
(generate_keypair): Follow the change of ask_curve.
(generate_subkeypair): Likewise.
--
GnuPG-bug-id: 3781
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'g10/main.h')
| -rw-r--r-- | g10/main.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/g10/main.h b/g10/main.h index 6c15a2a8d..af25d559c 100644 --- a/g10/main.h +++ b/g10/main.h @@ -292,6 +292,7 @@ u32 parse_expire_string(const char *string); u32 ask_expire_interval(int object,const char *def_expire); u32 ask_expiredate(void); unsigned int ask_key_flags (int algo, int subkey, unsigned int current); +const char *ask_curve (int *algo, int *subkey_algo, const char *current); void quick_generate_keypair (ctrl_t ctrl, const char *uid, const char *algostr, const char *usagestr, const char *expirestr); void generate_keypair (ctrl_t ctrl, int full, const char *fname, |