diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2018-11-28 14:10:35 +0300 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2018-11-28 23:37:34 +0300 |
| commit | 6de555791519e598054d1f6ee3088ce3f9675c96 (patch) | |
| tree | 51942c94e35064da439c20b2fed987fc7d6edf3c /lib/pkcs11_write.c | |
| parent | 5640b8665feebed66db25268d588cd233c2fab6e (diff) | |
| download | gnutls-6de555791519e598054d1f6ee3088ce3f9675c96.tar.gz | |
lib: fix pkcs11 using defines from PKCS#11 3.0 for EdDSAckm-eddsa
pkcs11 support code uses several definitions from forthcoming PKCS#11
standard version. Older p11-kit versions do not provide these
definitions. Detect and disable code supporting EdDSA if compiling
GnuTLS with older p11-kit library.
Closes #626
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Fixes: 88377775a3eff679a9ec60ab9bfc6b3c683a0407
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Diffstat (limited to 'lib/pkcs11_write.c')
| -rw-r--r-- | lib/pkcs11_write.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pkcs11_write.c b/lib/pkcs11_write.c index 07dd98e9c6..98afd169c7 100644 --- a/lib/pkcs11_write.c +++ b/lib/pkcs11_write.c @@ -943,6 +943,7 @@ gnutls_pkcs11_copy_x509_privkey2(const char *token_url, break; } +#ifdef HAVE_CKM_EDDSA case GNUTLS_PK_EDDSA_ED25519: { ret = @@ -967,6 +968,7 @@ gnutls_pkcs11_copy_x509_privkey2(const char *token_url, break; } +#endif default: gnutls_assert(); ret = GNUTLS_E_INVALID_REQUEST; |