[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  b6ca88ab9d7b3e15b6ba541bc581bf018c453537 (commit)
      from  0a2629b38e5f8ea95e51fff170e64ac59716a212 (commit)


- Log -----------------------------------------------------------------
commit b6ca88ab9d7b3e15b6ba541bc581bf018c453537
Author: Todd Short <tshort at akamai.com>
Date:   Tue Mar 29 13:40:48 2016 -0400

    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 at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/crypto.h | 5 ++---
 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 488c963..980389b 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 fc7dab0..ea47cb3 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);