Portability patch for HP MPE/iX. Submitted by Mark Bixby <mark_bixby@hp.com>

[oweals/openssl.git] / crypto / evp / p_lib.c

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 67047a36300ade6aa75db92de30601934d641e1b..62398ed74dcd9edabdccd4741b745440d278d261 100644 (file)
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -119,7 +119,7 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, EVP_PKEY *from)
 
        if (EVP_PKEY_missing_parameters(from))
                {
-               EVPerr(EVP_F_EVP_PKEY_COPY_PARAMETERS,EVP_R_MISSING_PARMATERS);
+               EVPerr(EVP_F_EVP_PKEY_COPY_PARAMETERS,EVP_R_MISSING_PARAMETERS);
                goto err;
                }
 #ifndef NO_DSA
@@ -180,7 +180,7 @@ EVP_PKEY *EVP_PKEY_new(void)
        {
        EVP_PKEY *ret;
 
-       ret=(EVP_PKEY *)Malloc(sizeof(EVP_PKEY));
+       ret=(EVP_PKEY *)OPENSSL_malloc(sizeof(EVP_PKEY));
        if (ret == NULL)
                {
                EVPerr(EVP_F_EVP_PKEY_NEW,ERR_R_MALLOC_FAILURE);
@@ -206,17 +206,17 @@ int EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key)
        }
 
 #ifndef NO_RSA
-int EVP_PKEY_rset_RSA(EVP_PKEY *pkey, RSA *key)
+int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key)
 {
        int ret = EVP_PKEY_assign_RSA(pkey, key);
        if(ret) CRYPTO_add(&key->references, 1, CRYPTO_LOCK_RSA);
        return ret;
 }
 
-RSA *EVP_PKEY_rget_RSA(EVP_PKEY *pkey)
+RSA *EVP_PKEY_get1_RSA(EVP_PKEY *pkey)
        {
        if(pkey->type != EVP_PKEY_RSA) {
-               EVPerr(EVP_F_EVP_PKEY_RGET_RSA, EVP_R_EXPECTING_AN_RSA_KEY);
+               EVPerr(EVP_F_EVP_PKEY_GET1_RSA, EVP_R_EXPECTING_AN_RSA_KEY);
                return NULL;
        }
        CRYPTO_add(&pkey->pkey.rsa->references, 1, CRYPTO_LOCK_RSA);
@@ -225,17 +225,17 @@ RSA *EVP_PKEY_rget_RSA(EVP_PKEY *pkey)
 #endif
 
 #ifndef NO_DSA
-int EVP_PKEY_rset_DSA(EVP_PKEY *pkey, DSA *key)
+int EVP_PKEY_set1_DSA(EVP_PKEY *pkey, DSA *key)
 {
        int ret = EVP_PKEY_assign_DSA(pkey, key);
        if(ret) CRYPTO_add(&key->references, 1, CRYPTO_LOCK_DSA);
        return ret;
 }
 
-DSA *EVP_PKEY_rget_DSA(EVP_PKEY *pkey)
+DSA *EVP_PKEY_get1_DSA(EVP_PKEY *pkey)
        {
        if(pkey->type != EVP_PKEY_DSA) {
-               EVPerr(EVP_F_EVP_PKEY_RGET_DSA, EVP_R_EXPECTING_A_DSA_KEY);
+               EVPerr(EVP_F_EVP_PKEY_GET1_DSA, EVP_R_EXPECTING_A_DSA_KEY);
                return NULL;
        }
        CRYPTO_add(&pkey->pkey.dsa->references, 1, CRYPTO_LOCK_DSA);
@@ -245,17 +245,17 @@ DSA *EVP_PKEY_rget_DSA(EVP_PKEY *pkey)
 
 #ifndef NO_DH
 
-int EVP_PKEY_rset_DH(EVP_PKEY *pkey, DH *key)
+int EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key)
 {
        int ret = EVP_PKEY_assign_DH(pkey, key);
        if(ret) CRYPTO_add(&key->references, 1, CRYPTO_LOCK_DH);
        return ret;
 }
 
-DH *EVP_PKEY_rget_DH(EVP_PKEY *pkey)
+DH *EVP_PKEY_get1_DH(EVP_PKEY *pkey)
        {
        if(pkey->type != EVP_PKEY_DH) {
-               EVPerr(EVP_F_EVP_PKEY_RGET_DH, EVP_R_EXPECTING_A_DH_KEY);
+               EVPerr(EVP_F_EVP_PKEY_GET1_DH, EVP_R_EXPECTING_A_DH_KEY);
                return NULL;
        }
        CRYPTO_add(&pkey->pkey.dh->references, 1, CRYPTO_LOCK_DH);
@@ -302,7 +302,7 @@ void EVP_PKEY_free(EVP_PKEY *x)
                }
 #endif
        EVP_PKEY_free_it(x);
-       Free(x);
+       OPENSSL_free(x);
        }
 
 static void EVP_PKEY_free_it(EVP_PKEY *x)