diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/card-util.c | 5 | ||||
| -rw-r--r-- | g10/export.c | 4 | ||||
| -rw-r--r-- | g10/gpg.c | 2 | ||||
| -rw-r--r-- | g10/keygen.c | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/g10/card-util.c b/g10/card-util.c index cb4dbe5e1..843abd823 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -632,7 +632,8 @@ current_card_status (ctrl_t ctrl, estream_t fp, if (info.key_attr[i].curve) { const char *oid; - oid = openpgp_curve_to_oid (info.key_attr[i].curve, NULL); + oid = openpgp_curve_to_oid (info.key_attr[i].curve, + NULL, NULL); if (oid) curve_for_print = openpgp_oid_to_curve (oid, 0); } @@ -1545,7 +1546,7 @@ ask_card_keyattr (int keyno, const struct key_attr *current) if (curve) { key_attr->algo = algo; - oid_str = openpgp_curve_to_oid (curve, NULL); + oid_str = openpgp_curve_to_oid (curve, NULL, NULL); key_attr->curve = openpgp_oid_to_curve (oid_str, 0); } else diff --git a/g10/export.c b/g10/export.c index 3517be72c..9160680d7 100644 --- a/g10/export.c +++ b/g10/export.c @@ -517,7 +517,7 @@ match_curve_skey_pk (gcry_sexp_t s_key, PKT_public_key *pk) log_error ("no curve name\n"); return gpg_error (GPG_ERR_UNKNOWN_CURVE); } - oidstr = openpgp_curve_to_oid (curve_str, NULL); + oidstr = openpgp_curve_to_oid (curve_str, NULL, NULL); if (!oidstr) { log_error ("no OID known for curve '%s'\n", curve_str); @@ -1023,7 +1023,7 @@ transfer_format_to_openpgp (gcry_sexp_t s_pgp, PKT_public_key *pk) goto leave; } - oidstr = openpgp_curve_to_oid (curve, NULL); + oidstr = openpgp_curve_to_oid (curve, NULL, NULL); if (!oidstr) { log_error ("no OID known for curve '%s'\n", curve); @@ -1879,7 +1879,7 @@ list_config(char *items) es_printf ("cfg:curveoid:"); for (iter=0, first=1; (s = openpgp_enum_curves (&iter)); first = 0) { - s = openpgp_curve_to_oid (s, NULL); + s = openpgp_curve_to_oid (s, NULL, NULL); es_printf ("%s%s", first?"":";", s? s:"[?]"); } es_printf ("\n"); diff --git a/g10/keygen.c b/g10/keygen.c index 447743fca..06b098822 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -1312,7 +1312,7 @@ ecckey_from_sexp (gcry_mpi_t *array, gcry_sexp_t sexp, int algo) goto leave; } gcry_sexp_release (l2); - oidstr = openpgp_curve_to_oid (curve, &nbits); + oidstr = openpgp_curve_to_oid (curve, &nbits, NULL); if (!oidstr) { /* That can't happen because we used one of the curves |