diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-03-13 14:26:04 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-03-13 14:26:04 +0000 |
| commit | 9620067392933868a1b2b048637db04c5766e932 (patch) | |
| tree | ede9cf3b2838eba4e02b51b8f54707f25120de05 | |
| parent | 814dfe70bc6188f2191e8491a26804fd09be71e4 (diff) | |
| download | openssl-new-9620067392933868a1b2b048637db04c5766e932.tar.gz | |
Use correct EC string when writing private keys in FIPS mode.
| -rw-r--r-- | crypto/pem/pem_all.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c index b2bef24c28..69dd19bf2e 100644 --- a/crypto/pem/pem_all.c +++ b/crypto/pem/pem_all.c @@ -427,6 +427,25 @@ IMPLEMENT_PEM_rw_const(DHparams, DH, PEM_STRING_DHPARAMS, DHparams) #ifdef OPENSSL_FIPS +static const char *pkey_str(EVP_PKEY *x) + { + switch (x->type) + { + case EVP_PKEY_RSA: + return PEM_STRING_RSA; + + case EVP_PKEY_DSA: + return PEM_STRING_DSA; + + case EVP_PKEY_EC: + return PEM_STRING_ECPRIVATEKEY; + + default: + return NULL; + } + } + + int PEM_write_bio_PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc, unsigned char *kstr, int klen, pem_password_cb *cb, void *u) @@ -436,8 +455,7 @@ int PEM_write_bio_PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc, (char *)kstr, klen, cb, u); else return PEM_ASN1_write_bio((i2d_of_void *)i2d_PrivateKey, - (((x)->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA), - bp,(char *)x,enc,kstr,klen,cb,u); + pkey_str(x), bp,(char *)x,enc,kstr,klen,cb,u); } #ifndef OPENSSL_NO_FP_API @@ -450,8 +468,7 @@ int PEM_write_PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc, (char *)kstr, klen, cb, u); else return PEM_ASN1_write((i2d_of_void *)i2d_PrivateKey, - (((x)->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA), - fp,(char *)x,enc,kstr,klen,cb,u); + pkey_str(x), fp,(char *)x,enc,kstr,klen,cb,u); } #endif |