diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-04-27 12:12:06 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-04-27 16:14:16 +0200 |
| commit | d95d4a4f3abbc54c7d03872d7bf0987be61c1051 (patch) | |
| tree | 97161051903b1b3039876335c5a2f30cd1f81da4 /lib/pkcs11_privkey.c | |
| parent | cacb61d6885eef58f09da7fd958496a11e2000c5 (diff) | |
| download | gnutls-d95d4a4f3abbc54c7d03872d7bf0987be61c1051.tar.gz | |
Added support for generating and reading EdDSA/Ed25519 keyseddsa2
This adds support for draft-ietf-curdle-pkix-00
Diffstat (limited to 'lib/pkcs11_privkey.c')
| -rw-r--r-- | lib/pkcs11_privkey.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pkcs11_privkey.c b/lib/pkcs11_privkey.c index 531f646f5a..5f0f1a2372 100644 --- a/lib/pkcs11_privkey.c +++ b/lib/pkcs11_privkey.c @@ -302,7 +302,7 @@ _gnutls_pkcs11_privkey_sign_hash(gnutls_pkcs11_privkey_t key, } - if (key->pk_algorithm == GNUTLS_PK_EC + if (key->pk_algorithm == GNUTLS_PK_ECDSA || key->pk_algorithm == GNUTLS_PK_DSA) { unsigned int hlen = siglen / 2; gnutls_datum_t r, s; @@ -891,7 +891,7 @@ gnutls_pkcs11_privkey_generate3(const char *url, gnutls_pk_algorithm_t pk, } break; - case GNUTLS_PK_EC: + case GNUTLS_PK_ECDSA: p[p_val].type = CKA_SIGN; if (key_usage & GNUTLS_KEY_DIGITAL_SIGNATURE) { p[p_val].value = (void *) &tval; @@ -910,7 +910,7 @@ gnutls_pkcs11_privkey_generate3(const char *url, gnutls_pk_algorithm_t pk, if (GNUTLS_BITS_ARE_CURVE(bits)) { bits = GNUTLS_BITS_TO_CURVE(bits); } else { - bits = _gnutls_ecc_bits_to_curve(bits); + bits = _gnutls_ecc_bits_to_curve(pk, bits); } ret = _gnutls_x509_write_ecc_params(bits, &der); |