diff options
| author | NIIBE Yutaka <[email protected]> | 2020-06-23 01:10:29 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2020-06-23 01:10:29 +0000 |
| commit | c94eea15d6847c08d2d9ff1c7608953f25fea67d (patch) | |
| tree | 5f7568a7e6bdde48a2ddb677172e210ef904c803 /g10/keygen.c | |
| parent | agent: Use get_pk_algo_from_key. (diff) | |
| download | gnupg-c94eea15d6847c08d2d9ff1c7608953f25fea67d.tar.gz gnupg-c94eea15d6847c08d2d9ff1c7608953f25fea67d.zip | |
ecc: Use "cv448" to specify key using X448.
* common/openpgp-oid.c (oidtable): Use "cv448".
(oid_cv448): Rename from oid_x448.
(openpgp_oidbuf_is_cv448, openpgp_oid_is_cv448): Likewise.
* common/util.h (openpgp_oid_is_cv448): Follow the change.
* g10/ecdh.c (pk_ecdh_generate_ephemeral_key): Likewise.
* g10/keygen.c (gen_ecc, ask_algo): Use "cv448".
(parse_key_parameter_part): Likewise.
* g10/pkglue.c (get_data_from_sexp): Fix for debug output.
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'g10/keygen.c')
| -rw-r--r-- | g10/keygen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/keygen.c b/g10/keygen.c index aab5929ef..590536726 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -1748,7 +1748,7 @@ gen_ecc (int algo, const char *curve, kbnode_t pub_root, curve = "Curve25519"; else if (!ascii_strcasecmp (curve, "ed25519")) curve = "Ed25519"; - else if (!ascii_strcasecmp (curve, "x448")) + else if (!ascii_strcasecmp (curve, "cv448")) curve = "X448"; /* Note that we use the "comp" flag with EdDSA to request the use of @@ -2328,7 +2328,7 @@ ask_algo (ctrl_t ctrl, int addmode, int *r_subkey_algo, unsigned int *r_usage, kpi->algo = PUBKEY_ALGO_EDDSA; else if (!strcmp (algostr, "cv25519")) kpi->algo = PUBKEY_ALGO_ECDH; - else if (!strcmp (algostr, "x448")) + else if (!strcmp (algostr, "cv448")) kpi->algo = PUBKEY_ALGO_ECDH; else if ((kpi->usage & GCRY_PK_USAGE_ENCR)) kpi->algo = PUBKEY_ALGO_ECDH; @@ -3483,7 +3483,7 @@ parse_key_parameter_part (ctrl_t ctrl, algo = PUBKEY_ALGO_EDDSA; else if (!strcmp (algostr, "cv25519")) algo = PUBKEY_ALGO_ECDH; - else if (!strcmp (algostr, "x448")) + else if (!strcmp (algostr, "cv448")) algo = PUBKEY_ALGO_ECDH; else if ((kpi->usage & GCRY_PK_USAGE_ENCR)) algo = PUBKEY_ALGO_ECDH; @@ -3612,7 +3612,7 @@ parse_key_parameter_part (ctrl_t ctrl, * elg2048 := Elgamal with 2048 bit. * ed25519 := EDDSA using curve Ed25519. * cv25519 := ECDH using curve Curve25519. - * x448 := ECDH using curve X448. + * cv448 := ECDH using curve X448. * nistp256:= ECDSA or ECDH using curve NIST P-256 * * All strings with an unknown prefix are considered an elliptic |