This commit was manufactured by cvs2svn to create branch

[oweals/openssl.git] / crypto / pem / pem_all.c

diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c
index a0b6032f75810756c1a14f74d2e3d652b4c76ff0..dc9c35b4b48c21a848d47d9b8ed80be3e5c8d073 100644 (file)
--- a/crypto/pem/pem_all.c
+++ b/crypto/pem/pem_all.c
@@ -78,6 +78,8 @@ IMPLEMENT_PEM_rw(X509_AUX, X509, PEM_STRING_X509_TRUSTED, X509_AUX)
 
 IMPLEMENT_PEM_rw(X509_REQ, X509_REQ, PEM_STRING_X509_REQ, X509_REQ)
 
+IMPLEMENT_PEM_write(X509_REQ_NEW, X509_REQ, PEM_STRING_X509_REQ_OLD, X509_REQ)
+
 IMPLEMENT_PEM_rw(X509_CRL, X509_CRL, PEM_STRING_X509_CRL, X509_CRL)
 
 IMPLEMENT_PEM_rw(PKCS7, PKCS7, PEM_STRING_PKCS7, PKCS7)
@@ -103,7 +105,7 @@ static RSA *pkey_get_rsa(EVP_PKEY *key, RSA **rsa)
 {
        RSA *rtmp;
        if(!key) return NULL;
-       rtmp = EVP_PKEY_rget_RSA(key);
+       rtmp = EVP_PKEY_get1_RSA(key);
        EVP_PKEY_free(key);
        if(!rtmp) return NULL;
        if(rsa) {
@@ -145,7 +147,7 @@ static DSA *pkey_get_dsa(EVP_PKEY *key, DSA **dsa)
 {
        DSA *dtmp;
        if(!key) return NULL;
-       dtmp = EVP_PKEY_rget_DSA(key);
+       dtmp = EVP_PKEY_get1_DSA(key);
        EVP_PKEY_free(key);
        if(!dtmp) return NULL;
        if(dsa) {