diff options
author | jsing <> | 2022-11-10 16:37:52 +0000 |
---|---|---|
committer | jsing <> | 2022-11-10 16:37:52 +0000 |
commit | 8bbca4710a981e94365a52a3aad374c251e1d0a5 (patch) | |
tree | a195899b53d4926967b849934341c4be077ceb67 /src/lib/libcrypto/asn1 | |
parent | 313fb25a243cac7bb2c5d40518041217e06a9d16 (diff) | |
download | openbsd-8bbca4710a981e94365a52a3aad374c251e1d0a5.tar.gz openbsd-8bbca4710a981e94365a52a3aad374c251e1d0a5.tar.bz2 openbsd-8bbca4710a981e94365a52a3aad374c251e1d0a5.zip |
Implement EVP interfaces for Ed25519 and X25519.
ok beck@ tb@
Diffstat (limited to 'src/lib/libcrypto/asn1')
-rw-r--r-- | src/lib/libcrypto/asn1/ameth_lib.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/libcrypto/asn1/ameth_lib.c b/src/lib/libcrypto/asn1/ameth_lib.c index cca1dcce7d..143c010dfa 100644 --- a/src/lib/libcrypto/asn1/ameth_lib.c +++ b/src/lib/libcrypto/asn1/ameth_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ameth_lib.c,v 1.28 2022/11/09 18:17:16 jsing Exp $ */ | 1 | /* $OpenBSD: ameth_lib.c,v 1.29 2022/11/10 16:37:51 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2006. | 3 | * project 2006. |
4 | */ | 4 | */ |
@@ -75,11 +75,13 @@ extern const EVP_PKEY_ASN1_METHOD cmac_asn1_meth; | |||
75 | extern const EVP_PKEY_ASN1_METHOD dh_asn1_meth; | 75 | extern const EVP_PKEY_ASN1_METHOD dh_asn1_meth; |
76 | extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[]; | 76 | extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[]; |
77 | extern const EVP_PKEY_ASN1_METHOD eckey_asn1_meth; | 77 | extern const EVP_PKEY_ASN1_METHOD eckey_asn1_meth; |
78 | extern const EVP_PKEY_ASN1_METHOD ed25519_asn1_meth; | ||
78 | extern const EVP_PKEY_ASN1_METHOD gostimit_asn1_meth; | 79 | extern const EVP_PKEY_ASN1_METHOD gostimit_asn1_meth; |
79 | extern const EVP_PKEY_ASN1_METHOD gostr01_asn1_meths[]; | 80 | extern const EVP_PKEY_ASN1_METHOD gostr01_asn1_meths[]; |
80 | extern const EVP_PKEY_ASN1_METHOD hmac_asn1_meth; | 81 | extern const EVP_PKEY_ASN1_METHOD hmac_asn1_meth; |
81 | extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[]; | 82 | extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[]; |
82 | extern const EVP_PKEY_ASN1_METHOD rsa_pss_asn1_meth; | 83 | extern const EVP_PKEY_ASN1_METHOD rsa_pss_asn1_meth; |
84 | extern const EVP_PKEY_ASN1_METHOD x25519_asn1_meth; | ||
83 | 85 | ||
84 | static const EVP_PKEY_ASN1_METHOD *asn1_methods[] = { | 86 | static const EVP_PKEY_ASN1_METHOD *asn1_methods[] = { |
85 | &cmac_asn1_meth, | 87 | &cmac_asn1_meth, |
@@ -90,6 +92,7 @@ static const EVP_PKEY_ASN1_METHOD *asn1_methods[] = { | |||
90 | &dsa_asn1_meths[3], | 92 | &dsa_asn1_meths[3], |
91 | &dsa_asn1_meths[4], | 93 | &dsa_asn1_meths[4], |
92 | &eckey_asn1_meth, | 94 | &eckey_asn1_meth, |
95 | &ed25519_asn1_meth, | ||
93 | &gostimit_asn1_meth, | 96 | &gostimit_asn1_meth, |
94 | &gostr01_asn1_meths[0], | 97 | &gostr01_asn1_meths[0], |
95 | &gostr01_asn1_meths[1], | 98 | &gostr01_asn1_meths[1], |
@@ -98,6 +101,7 @@ static const EVP_PKEY_ASN1_METHOD *asn1_methods[] = { | |||
98 | &rsa_asn1_meths[0], | 101 | &rsa_asn1_meths[0], |
99 | &rsa_asn1_meths[1], | 102 | &rsa_asn1_meths[1], |
100 | &rsa_pss_asn1_meth, | 103 | &rsa_pss_asn1_meth, |
104 | &x25519_asn1_meth, | ||
101 | }; | 105 | }; |
102 | 106 | ||
103 | static const size_t asn1_methods_count = | 107 | static const size_t asn1_methods_count = |