diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2001-08-12 16:52:00 +0000 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2001-08-12 16:52:00 +0000 |
| commit | b7727ee616a3351a001497dda077ec63330861db (patch) | |
| tree | cfb5ada448b2a405e2b7b3967a48ba61f690d9aa /ssl | |
| parent | f0446ca8d746ff138a892588e33597411f59f5fa (diff) | |
The indexes returned by ***_get_ex_new_index() functions are used when
setting stack (actually, array) values in ex_data. So only increment the
global counters if the underlying CRYPTO_get_ex_new_index() call succeeds.
This change doesn't make "ex_data" right (see the comment at the head of
ex_data.c to know why), but at least makes the source code marginally less
frustrating.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_lib.c | 14 | ||||
| -rw-r--r-- | ssl/ssl_sess.c | 8 |
2 files changed, 12 insertions, 10 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index f4dfdbf250..df085e6a02 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -2051,9 +2051,10 @@ long SSL_get_verify_result(SSL *ssl) int SSL_get_ex_new_index(long argl,void *argp,CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,CRYPTO_EX_free *free_func) { - ssl_meth_num++; - return(CRYPTO_get_ex_new_index(ssl_meth_num-1, - &ssl_meth,argl,argp,new_func,dup_func,free_func)); + if(CRYPTO_get_ex_new_index(ssl_meth_num, &ssl_meth, argl, argp, + new_func, dup_func, free_func) < 0) + return -1; + return (ssl_meth_num++); } int SSL_set_ex_data(SSL *s,int idx,void *arg) @@ -2069,9 +2070,10 @@ void *SSL_get_ex_data(SSL *s,int idx) int SSL_CTX_get_ex_new_index(long argl,void *argp,CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,CRYPTO_EX_free *free_func) { - ssl_ctx_meth_num++; - return(CRYPTO_get_ex_new_index(ssl_ctx_meth_num-1, - &ssl_ctx_meth,argl,argp,new_func,dup_func,free_func)); + if(CRYPTO_get_ex_new_index(ssl_ctx_meth_num, &ssl_ctx_meth, argl, argp, + new_func, dup_func, free_func) < 0) + return -1; + return (ssl_ctx_meth_num++); } int SSL_CTX_set_ex_data(SSL_CTX *s,int idx,void *arg) diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 1b87de9d21..5821792b76 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -91,10 +91,10 @@ SSL_SESSION *SSL_get1_session(SSL *ssl) int SSL_SESSION_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func) { - ssl_session_num++; - return(CRYPTO_get_ex_new_index(ssl_session_num-1, - &ssl_session_meth, - argl,argp,new_func,dup_func,free_func)); + if(CRYPTO_get_ex_new_index(ssl_session_num, &ssl_session_meth, argl, + argp, new_func, dup_func, free_func) < 0) + return -1; + return (ssl_session_num++); } int SSL_SESSION_set_ex_data(SSL_SESSION *s, int idx, void *arg) |