Rename recently introduced functions for improved code clarity:
[DR]SA_up => [DR]SA_up_ref
diff --git a/crypto/dsa/dsa.h b/crypto/dsa/dsa.h
index 7fc8fd3..e12cee0 100644
--- a/crypto/dsa/dsa.h
+++ b/crypto/dsa/dsa.h
@@ -179,7 +179,7 @@
#endif
void DSA_free (DSA *r);
/* "up" the DSA object's reference count */
-int DSA_up(DSA *r);
+int DSA_up_ref(DSA *r);
int DSA_size(const DSA *);
/* next 4 return -1 on error */
int DSA_sign_setup( DSA *dsa,BN_CTX *ctx_in,BIGNUM **kinvp,BIGNUM **rp);
diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index bae39c2..365145a 100644
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -226,7 +226,7 @@
OPENSSL_free(r);
}
-int DSA_up(DSA *r)
+int DSA_up_ref(DSA *r)
{
int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_DSA);
#ifdef REF_PRINT
@@ -235,7 +235,7 @@
#ifdef REF_CHECK
if (i < 2)
{
- fprintf(stderr, "DSA_up, bad reference count\n");
+ fprintf(stderr, "DSA_up_ref, bad reference count\n");
abort();
}
#endif
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 86178f1..04f75a5 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -211,7 +211,7 @@
{
int ret = EVP_PKEY_assign_RSA(pkey, key);
if(ret)
- RSA_up(key);
+ RSA_up_ref(key);
return ret;
}
@@ -221,7 +221,7 @@
EVPerr(EVP_F_EVP_PKEY_GET1_RSA, EVP_R_EXPECTING_AN_RSA_KEY);
return NULL;
}
- RSA_up(pkey->pkey.rsa);
+ RSA_up_ref(pkey->pkey.rsa);
return pkey->pkey.rsa;
}
#endif
@@ -231,7 +231,7 @@
{
int ret = EVP_PKEY_assign_DSA(pkey, key);
if(ret)
- DSA_up(key);
+ DSA_up_ref(key);
return ret;
}
@@ -241,7 +241,7 @@
EVPerr(EVP_F_EVP_PKEY_GET1_DSA, EVP_R_EXPECTING_A_DSA_KEY);
return NULL;
}
- DSA_up(pkey->pkey.dsa);
+ DSA_up_ref(pkey->pkey.dsa);
return pkey->pkey.dsa;
}
#endif
diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h
index 9116a6e..993b539 100644
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -200,7 +200,7 @@
unsigned char *to, RSA *rsa,int padding);
void RSA_free (RSA *r);
/* "up" the RSA object's reference count */
-int RSA_up(RSA *r);
+int RSA_up_ref(RSA *r);
int RSA_flags(const RSA *r);
diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
index e3368c1..ef9f924 100644
--- a/crypto/rsa/rsa_lib.c
+++ b/crypto/rsa/rsa_lib.c
@@ -246,7 +246,7 @@
OPENSSL_free(r);
}
-int RSA_up(RSA *r)
+int RSA_up_ref(RSA *r)
{
int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_RSA);
#ifdef REF_PRINT
@@ -255,7 +255,7 @@
#ifdef REF_CHECK
if (i < 2)
{
- fprintf(stderr, "RSA_up, bad reference count\n");
+ fprintf(stderr, "RSA_up_ref, bad reference count\n");
abort();
}
#endif
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index af65e2e..4d0d800 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -982,7 +982,7 @@
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_ERROR_GENERATING_TMP_RSA_KEY);
goto f_err;
}
- RSA_up(rsa);
+ RSA_up_ref(rsa);
cert->rsa_tmp=rsa;
}
if (rsa == NULL)
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index fcd6ff9..6895f62 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -190,7 +190,7 @@
#ifndef OPENSSL_NO_RSA
if (cert->rsa_tmp != NULL)
{
- RSA_up(cert->rsa_tmp);
+ RSA_up_ref(cert->rsa_tmp);
ret->rsa_tmp = cert->rsa_tmp;
}
ret->rsa_tmp_cb = cert->rsa_tmp_cb;
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index e6d7f38..b15dd50 100644
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -170,7 +170,7 @@
return(0);
}
- RSA_up(rsa);
+ RSA_up_ref(rsa);
EVP_PKEY_assign_RSA(pkey,rsa);
ret=ssl_set_pkey(ssl->cert,pkey);
@@ -582,7 +582,7 @@
return(0);
}
- RSA_up(rsa);
+ RSA_up_ref(rsa);
EVP_PKEY_assign_RSA(pkey,rsa);
ret=ssl_set_pkey(ctx->cert, pkey);
diff --git a/util/libeay.num b/util/libeay.num
index 3e274c9..6469927 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2650,8 +2650,8 @@
ENGINE_load_ciphers 3099 EXIST::FUNCTION:
ENGINE_get_cipher_by_name 3100 EXIST::FUNCTION:
ENGINE_cipher_num 3101 EXIST::FUNCTION:
-DH_up 3102 EXIST::FUNCTION:DH
-RSA_up 3103 EXIST::FUNCTION:RSA
+DH_up_ref 3102 EXIST::FUNCTION:DH
+RSA_up_ref 3103 EXIST::FUNCTION:RSA
EVP_DigestInit_dbg 3104 EXIST::FUNCTION:
CRYPTO_cleanup_all_ex_data 3105 EXIST::FUNCTION:
CRYPTO_set_ex_data_implementation 3106 EXIST::FUNCTION:
