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/pem | |
| 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/pem')
| -rw-r--r-- | crypto/pem/pem.h | 2 | ||||
| -rw-r--r-- | crypto/pem/pem_all.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h index 8a6ababe3a..5872fcc1c5 100644 --- a/crypto/pem/pem.h +++ b/crypto/pem/pem.h @@ -129,6 +129,7 @@ extern "C" { #define PEM_STRING_PKCS8 "ENCRYPTED PRIVATE KEY" #define PEM_STRING_PKCS8INF "PRIVATE KEY" #define PEM_STRING_DHPARAMS "DH PARAMETERS" +#define PEM_STRING_DHXPARAMS "X9.42 DH PARAMETERS" #define PEM_STRING_SSL_SESSION "SSL SESSION PARAMETERS" #define PEM_STRING_DSAPARAMS "DSA PARAMETERS" #define PEM_STRING_ECDSA_PUBLIC "ECDSA PUBLIC KEY" @@ -503,6 +504,7 @@ DECLARE_PEM_rw(EC_PUBKEY, EC_KEY) #ifndef OPENSSL_NO_DH DECLARE_PEM_rw_const(DHparams, DH) +DECLARE_PEM_write_const(DHxparams, DH) #endif diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c index 3e7a6093ad..e09b24ad7a 100644 --- a/crypto/pem/pem_all.c +++ b/crypto/pem/pem_all.c @@ -290,6 +290,7 @@ EC_KEY *PEM_read_ECPrivateKey(FILE *fp, EC_KEY **eckey, pem_password_cb *cb, #ifndef OPENSSL_NO_DH IMPLEMENT_PEM_rw_const(DHparams, DH, PEM_STRING_DHPARAMS, DHparams) +IMPLEMENT_PEM_write_const(DHxparams, DH, PEM_STRING_DHXPARAMS, DHxparams) #endif |