From a1515b3bbc10a210040dda3b482bcdb933fa8d7c Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 29 Mar 2018 11:56:02 +0900 Subject: 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 --- g10/main.h | 1 + 1 file changed, 1 insertion(+) (limited to 'g10/main.h') 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, -- cgit v1.2.3