diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-07-21 10:06:03 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-12-01 11:48:37 -0500 |
| commit | e6390acac925f952cfd06ccdbba0b273b8f71551 (patch) | |
| tree | 219e865d2b4e0a2b362429e56829d5caf1b69ced /ssl | |
| parent | d59c7c81e3850dc667d61047850c3b6936eb5fca (diff) | |
ex_data part 2: doc fixes and CRYPTO_free_ex_index.
Add CRYPTO_free_ex_index (for shared libraries)
Unify and complete the documentation for all "ex_data" API's and objects.
Replace xxx_get_ex_new_index functions with a macro.
Added an exdata test.
Renamed the ex_data internal datatypes.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_lib.c | 15 | ||||
| -rw-r--r-- | ssl/ssl_sess.c | 9 |
2 files changed, 0 insertions, 24 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 12ae35cf8c..cac692dd38 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -3042,13 +3042,6 @@ size_t SSL_SESSION_get_master_key(const SSL_SESSION *session, return outlen; } -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) -{ - return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL, argl, argp, - new_func, dup_func, free_func); -} - int SSL_set_ex_data(SSL *s, int idx, void *arg) { return (CRYPTO_set_ex_data(&s->ex_data, idx, arg)); @@ -3059,14 +3052,6 @@ void *SSL_get_ex_data(const SSL *s, int idx) return (CRYPTO_get_ex_data(&s->ex_data, 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) -{ - return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL_CTX, argl, argp, - new_func, dup_func, free_func); -} - int SSL_CTX_set_ex_data(SSL_CTX *s, int idx, void *arg) { return (CRYPTO_set_ex_data(&s->ex_data, idx, arg)); diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 0984445b77..5265b15983 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -170,15 +170,6 @@ SSL_SESSION *SSL_get1_session(SSL *ssl) return (sess); } -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) -{ - return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL_SESSION, argl, argp, - new_func, dup_func, free_func); -} - int SSL_SESSION_set_ex_data(SSL_SESSION *s, int idx, void *arg) { return (CRYPTO_set_ex_data(&s->ex_data, idx, arg)); |