diff options
| author | Todd Short <tshort@akamai.com> | 2016-03-29 13:40:48 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-29 16:22:08 -0400 |
| commit | b6ca88ab9d7b3e15b6ba541bc581bf018c453537 (patch) | |
| tree | 9e297a0abc344f88660e4c149d630a925a225df5 /include | |
| parent | 0a2629b38e5f8ea95e51fff170e64ac59716a212 (diff) | |
Fixup SSL EX_DATA index
The SSL, SSL_CTX, and SSL_SESSION indices were being referenced
incorrectly in the "_get_ex_new_index" functions.
Remove the STORE EX_DATA index; that functionality is gone.
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/crypto.h | 5 | ||||
| -rw-r--r-- | include/openssl/ssl.h | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 488c963f68..980389b300 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -218,9 +218,8 @@ DEFINE_STACK_OF(void) # define CRYPTO_EX_INDEX_ENGINE 10 # define CRYPTO_EX_INDEX_UI 11 # define CRYPTO_EX_INDEX_BIO 12 -# define CRYPTO_EX_INDEX_STORE 13 -# define CRYPTO_EX_INDEX_APP 14 -# define CRYPTO_EX_INDEX__COUNT 15 +# define CRYPTO_EX_INDEX_APP 13 +# define CRYPTO_EX_INDEX__COUNT 14 /* * This is the default callbacks, but we can have others as well: this is diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index fc7dab06fd..ea47cb3da3 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1764,15 +1764,15 @@ __owur size_t SSL_SESSION_get_master_key(const SSL_SESSION *ssl, unsigned char *out, size_t outlen); #define SSL_get_ex_new_index(l, p, newf, dupf, freef) \ - CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL_SESSION, l, p, newf, dupf, freef) + CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL, l, p, newf, dupf, freef) __owur int SSL_set_ex_data(SSL *ssl, int idx, void *data); void *SSL_get_ex_data(const SSL *ssl, int idx); #define SSL_SESSION_get_ex_new_index(l, p, newf, dupf, freef) \ - CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL_CTX, l, p, newf, dupf, freef) + CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL_SESSION, l, p, newf, dupf, freef) __owur int SSL_SESSION_set_ex_data(SSL_SESSION *ss, int idx, void *data); void *SSL_SESSION_get_ex_data(const SSL_SESSION *ss, int idx); #define SSL_CTX_get_ex_new_index(l, p, newf, dupf, freef) \ - CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL, l, p, newf, dupf, freef) + CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL_CTX, l, p, newf, dupf, freef) __owur int SSL_CTX_set_ex_data(SSL_CTX *ssl, int idx, void *data); void *SSL_CTX_get_ex_data(const SSL_CTX *ssl, int idx); |