diff options
Diffstat (limited to 'src/lib/libcrypto/evp/pmeth_lib.c')
-rw-r--r-- | src/lib/libcrypto/evp/pmeth_lib.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/libcrypto/evp/pmeth_lib.c b/src/lib/libcrypto/evp/pmeth_lib.c index 12267a6d93..24cdfdd1d0 100644 --- a/src/lib/libcrypto/evp/pmeth_lib.c +++ b/src/lib/libcrypto/evp/pmeth_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pmeth_lib.c,v 1.9 2014/07/12 16:03:37 miod Exp $ */ | 1 | /* $OpenBSD: pmeth_lib.c,v 1.10 2014/11/09 19:17:13 miod 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 | */ |
@@ -79,6 +79,7 @@ STACK_OF(EVP_PKEY_METHOD) *app_pkey_methods = NULL; | |||
79 | 79 | ||
80 | extern const EVP_PKEY_METHOD rsa_pkey_meth, dh_pkey_meth, dsa_pkey_meth; | 80 | extern const EVP_PKEY_METHOD rsa_pkey_meth, dh_pkey_meth, dsa_pkey_meth; |
81 | extern const EVP_PKEY_METHOD ec_pkey_meth, hmac_pkey_meth, cmac_pkey_meth; | 81 | extern const EVP_PKEY_METHOD ec_pkey_meth, hmac_pkey_meth, cmac_pkey_meth; |
82 | extern const EVP_PKEY_METHOD gostimit_pkey_meth, gostr01_pkey_meth; | ||
82 | 83 | ||
83 | static const EVP_PKEY_METHOD *standard_methods[] = { | 84 | static const EVP_PKEY_METHOD *standard_methods[] = { |
84 | #ifndef OPENSSL_NO_RSA | 85 | #ifndef OPENSSL_NO_RSA |
@@ -93,8 +94,12 @@ static const EVP_PKEY_METHOD *standard_methods[] = { | |||
93 | #ifndef OPENSSL_NO_EC | 94 | #ifndef OPENSSL_NO_EC |
94 | &ec_pkey_meth, | 95 | &ec_pkey_meth, |
95 | #endif | 96 | #endif |
97 | #ifndef OPENSSL_NO_GOST | ||
98 | &gostr01_pkey_meth, | ||
99 | &gostimit_pkey_meth, | ||
100 | #endif | ||
96 | &hmac_pkey_meth, | 101 | &hmac_pkey_meth, |
97 | &cmac_pkey_meth | 102 | &cmac_pkey_meth, |
98 | }; | 103 | }; |
99 | 104 | ||
100 | DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_METHOD *, const EVP_PKEY_METHOD *, | 105 | DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_METHOD *, const EVP_PKEY_METHOD *, |