diff options
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/app-openpgp.c | 8 | ||||
| -rw-r--r-- | scd/app-piv.c | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c index 07fbf7474..62ec710bb 100644 --- a/scd/app-openpgp.c +++ b/scd/app-openpgp.c @@ -1494,7 +1494,7 @@ ecdh_params (const char *curve) { unsigned int nbits; - openpgp_curve_to_oid (curve, &nbits); + openpgp_curve_to_oid (curve, &nbits, NULL); /* See RFC-6637 for those constants. 0x03: Number of bytes @@ -1535,7 +1535,7 @@ ecc_read_pubkey (app_t app, ctrl_t ctrl, u32 created_at, int keyno, } curve = app->app_local->keyattr[keyno].ecc.curve; - oidstr = openpgp_curve_to_oid (curve, NULL); + oidstr = openpgp_curve_to_oid (curve, NULL, NULL); err = openpgp_oid_from_str (oidstr, &oid); if (err) return err; @@ -3608,7 +3608,7 @@ change_keyattr_from_string (app_t app, ctrl_t ctrl, const unsigned char *oidbuf; size_t oid_len; - oidstr = openpgp_curve_to_oid (string+n, NULL); + oidstr = openpgp_curve_to_oid (string+n, NULL, NULL); if (!oidstr) { err = gpg_error (GPG_ERR_INV_DATA); @@ -4115,7 +4115,7 @@ ecc_writekey (app_t app, ctrl_t ctrl, else algo = PUBKEY_ALGO_ECDSA; - oidstr = openpgp_curve_to_oid (curve, NULL); + oidstr = openpgp_curve_to_oid (curve, NULL, NULL); err = openpgp_oid_from_str (oidstr, &oid); if (err) goto leave; diff --git a/scd/app-piv.c b/scd/app-piv.c index 1b3e2e75b..cefc9d997 100644 --- a/scd/app-piv.c +++ b/scd/app-piv.c @@ -2927,9 +2927,10 @@ writekey_ecc (app_t app, data_object_t dobj, int keyref, name[toklen] = 0; /* Canonicalize the curve name. We use the openpgp * functions here because Libgcrypt has no generic curve - * alias lookup feature and the PIV suppotred curves alre + * alias lookup feature and the PIV supported curves are * also supported by OpenPGP. */ - xname = openpgp_oid_to_curve (openpgp_curve_to_oid (name, NULL), 0); + xname = openpgp_oid_to_curve (openpgp_curve_to_oid (name, NULL, NULL), + 0); xfree (name); if (xname && !strcmp (xname, "nistp256")) |