generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename recently introduced functions for improved code clarity:

Browse Source 
[DR]SA_up  =>  [DR]SA_up_ref
This commit is contained in:
Bodo Möller 2001-09-03 13:40:07 +00:00
parent 983495c4b2
commit 6ac4e8bd6e
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/dsa/dsa.h
View File

@ -179,7 +179,7 @@ DSA * DSA_new_method(struct engine_st *engine);
#endif #endif
void DSA_free (DSA *r); void DSA_free (DSA *r);
/* "up" the DSA object's reference count */ /* "up" the DSA object's reference count */
int DSA_up(DSA *r); int DSA_up_ref(DSA *r);
int DSA_size(const DSA *); int DSA_size(const DSA *);
/* next 4 return -1 on error */ /* next 4 return -1 on error */
int DSA_sign_setup( DSA *dsa,BN_CTX *ctx_in,BIGNUM **kinvp,BIGNUM **rp); int DSA_sign_setup( DSA *dsa,BN_CTX *ctx_in,BIGNUM **kinvp,BIGNUM **rp);

4
crypto/dsa/dsa_lib.c
View File

@ -226,7 +226,7 @@ void DSA_free(DSA *r)
OPENSSL_free(r); OPENSSL_free(r);
} }
int DSA_up(DSA *r) int DSA_up_ref(DSA *r)
{ {
int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_DSA); int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_DSA);
#ifdef REF_PRINT #ifdef REF_PRINT
@ -235,7 +235,7 @@ int DSA_up(DSA *r)
#ifdef REF_CHECK #ifdef REF_CHECK
if (i < 2) if (i < 2)
{ {
fprintf(stderr, "DSA_up, bad reference count\n"); fprintf(stderr, "DSA_up_ref, bad reference count\n");
abort(); abort();
} }
#endif #endif

8
crypto/evp/p_lib.c
View File

@ -211,7 +211,7 @@ int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key)
{ {
int ret = EVP_PKEY_assign_RSA(pkey, key); int ret = EVP_PKEY_assign_RSA(pkey, key);
if(ret) if(ret)
RSA_up(key); RSA_up_ref(key);
return ret; return ret;
} }
@ -221,7 +221,7 @@ RSA *EVP_PKEY_get1_RSA(EVP_PKEY *pkey)
EVPerr(EVP_F_EVP_PKEY_GET1_RSA, EVP_R_EXPECTING_AN_RSA_KEY); EVPerr(EVP_F_EVP_PKEY_GET1_RSA, EVP_R_EXPECTING_AN_RSA_KEY);
return NULL; return NULL;
} }
RSA_up(pkey->pkey.rsa); RSA_up_ref(pkey->pkey.rsa);
return pkey->pkey.rsa; return pkey->pkey.rsa;
} }
#endif #endif
@ -231,7 +231,7 @@ int EVP_PKEY_set1_DSA(EVP_PKEY *pkey, DSA *key)
{ {
int ret = EVP_PKEY_assign_DSA(pkey, key); int ret = EVP_PKEY_assign_DSA(pkey, key);
if(ret) if(ret)
DSA_up(key); DSA_up_ref(key);
return ret; return ret;
} }
@ -241,7 +241,7 @@ DSA *EVP_PKEY_get1_DSA(EVP_PKEY *pkey)
EVPerr(EVP_F_EVP_PKEY_GET1_DSA, EVP_R_EXPECTING_A_DSA_KEY); EVPerr(EVP_F_EVP_PKEY_GET1_DSA, EVP_R_EXPECTING_A_DSA_KEY);
return NULL; return NULL;
} }
DSA_up(pkey->pkey.dsa); DSA_up_ref(pkey->pkey.dsa);
return pkey->pkey.dsa; return pkey->pkey.dsa;
} }
#endif #endif

2
crypto/rsa/rsa.h
View File

@ -200,7 +200,7 @@ int RSA_private_decrypt(int flen, const unsigned char *from,
unsigned char *to, RSA *rsa,int padding); unsigned char *to, RSA *rsa,int padding);
void RSA_free (RSA *r); void RSA_free (RSA *r);
/* "up" the RSA object's reference count */ /* "up" the RSA object's reference count */
int RSA_up(RSA *r); int RSA_up_ref(RSA *r);
int RSA_flags(const RSA *r); int RSA_flags(const RSA *r);

4
crypto/rsa/rsa_lib.c
View File

@ -246,7 +246,7 @@ void RSA_free(RSA *r)
OPENSSL_free(r); OPENSSL_free(r);
} }
int RSA_up(RSA *r) int RSA_up_ref(RSA *r)
{ {
int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_RSA); int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_RSA);
#ifdef REF_PRINT #ifdef REF_PRINT
@ -255,7 +255,7 @@ int RSA_up(RSA *r)
#ifdef REF_CHECK #ifdef REF_CHECK
if (i < 2) if (i < 2)
{ {
fprintf(stderr, "RSA_up, bad reference count\n"); fprintf(stderr, "RSA_up_ref, bad reference count\n");
abort(); abort();
} }
#endif #endif

2
ssl/s3_srvr.c
View File

@ -982,7 +982,7 @@ static int ssl3_send_server_key_exchange(SSL *s)
SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_ERROR_GENERATING_TMP_RSA_KEY); SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_ERROR_GENERATING_TMP_RSA_KEY);
goto f_err; goto f_err;
} }
RSA_up(rsa); RSA_up_ref(rsa);
cert->rsa_tmp=rsa; cert->rsa_tmp=rsa;
} }
if (rsa == NULL) if (rsa == NULL)

2
ssl/ssl_cert.c
View File

@ -190,7 +190,7 @@ CERT *ssl_cert_dup(CERT *cert)
#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_RSA
if (cert->rsa_tmp != NULL) 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 = cert->rsa_tmp;
} }
ret->rsa_tmp_cb = cert->rsa_tmp_cb; ret->rsa_tmp_cb = cert->rsa_tmp_cb;

4
ssl/ssl_rsa.c
View File

@ -170,7 +170,7 @@ int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa)
return(0); return(0);
} }
RSA_up(rsa); RSA_up_ref(rsa);
EVP_PKEY_assign_RSA(pkey,rsa); EVP_PKEY_assign_RSA(pkey,rsa);
ret=ssl_set_pkey(ssl->cert,pkey); ret=ssl_set_pkey(ssl->cert,pkey);
@ -582,7 +582,7 @@ int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa)
return(0); return(0);
} }
RSA_up(rsa); RSA_up_ref(rsa);
EVP_PKEY_assign_RSA(pkey,rsa); EVP_PKEY_assign_RSA(pkey,rsa);
ret=ssl_set_pkey(ctx->cert, pkey); ret=ssl_set_pkey(ctx->cert, pkey);

4
util/libeay.num
View File

@ -2650,8 +2650,8 @@ EVP_dev_crypto_rc4 3098 EXIST::FUNCTION:DES
ENGINE_load_ciphers 3099 EXIST::FUNCTION: ENGINE_load_ciphers 3099 EXIST::FUNCTION:
ENGINE_get_cipher_by_name 3100 EXIST::FUNCTION: ENGINE_get_cipher_by_name 3100 EXIST::FUNCTION:
ENGINE_cipher_num 3101 EXIST::FUNCTION: ENGINE_cipher_num 3101 EXIST::FUNCTION:
DH_up 3102 EXIST::FUNCTION:DH DH_up_ref 3102 EXIST::FUNCTION:DH
RSA_up 3103 EXIST::FUNCTION:RSA RSA_up_ref 3103 EXIST::FUNCTION:RSA
EVP_DigestInit_dbg 3104 EXIST::FUNCTION: EVP_DigestInit_dbg 3104 EXIST::FUNCTION:
CRYPTO_cleanup_all_ex_data 3105 EXIST::FUNCTION: CRYPTO_cleanup_all_ex_data 3105 EXIST::FUNCTION:
CRYPTO_set_ex_data_implementation 3106 EXIST::FUNCTION: CRYPTO_set_ex_data_implementation 3106 EXIST::FUNCTION: