diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-04-07 20:22:11 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-04-07 20:22:11 +0000 |
| commit | 491734eb21c29807ff64fddf273f073b6bafb0b0 (patch) | |
| tree | 16738086f2d1dd0c0d323250db3200709221a5ee /crypto/asn1 | |
| parent | 4e891a191dd5467791f17fd6b473c7419ed29244 (diff) | |
Initial experimental support for X9.42 DH parameter format to handle
RFC5114 parameters and X9.42 DH public and private keys.
(backport from HEAD)
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/ameth_lib.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c index a19e058fca..5fff226120 100644 --- a/crypto/asn1/ameth_lib.c +++ b/crypto/asn1/ameth_lib.c @@ -67,6 +67,7 @@ extern const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[]; extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[]; extern const EVP_PKEY_ASN1_METHOD dh_asn1_meth; +extern const EVP_PKEY_ASN1_METHOD dhx_asn1_meth; extern const EVP_PKEY_ASN1_METHOD eckey_asn1_meth; extern const EVP_PKEY_ASN1_METHOD hmac_asn1_meth; extern const EVP_PKEY_ASN1_METHOD cmac_asn1_meth; @@ -92,7 +93,10 @@ static const EVP_PKEY_ASN1_METHOD *standard_methods[] = &eckey_asn1_meth, #endif &hmac_asn1_meth, - &cmac_asn1_meth + &cmac_asn1_meth, +#ifndef OPENSSL_NO_DH + &dhx_asn1_meth +#endif }; typedef int sk_cmp_fn_type(const char * const *a, const char * const *b); |