diff options
| author | Ben Laurie <ben@links.org> | 2014-07-06 07:26:05 +0100 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2014-07-06 10:09:16 +0100 |
| commit | a97dc0e3edb6b4a23e7dd1e7dfbf8074b07f1bbe (patch) | |
| tree | ed7a27c1591aaf1ecbf31af74bd4c4f21bb27b60 | |
| parent | fa7fbb6b5a48ab814db03c49f153a5f78369bef2 (diff) | |
| download | openssl-new-a97dc0e3edb6b4a23e7dd1e7dfbf8074b07f1bbe.tar.gz | |
Make SSL_set_tlsext_debug_arg() a real function.
| -rw-r--r-- | ssl/s3_lib.c | 9 | ||||
| -rw-r--r-- | ssl/ssl.h | 1 | ||||
| -rw-r--r-- | ssl/tls1.h | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 072875b758..45f2faebc6 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3371,6 +3371,11 @@ void SSL_set_tlsext_debug_callback(SSL *s, void (*cb)(SSL *, int ,int, s->tlsext_debug_cb = cb; } +void SSL_set_tlsext_debug_arg(SSL *s, void *arg) + { + s->tlsext_debug_arg = arg; + } + #endif /* ndef OPENSSL_NO_TLSEXT */ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) @@ -3534,10 +3539,6 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) break; #endif /* !OPENSSL_NO_ECDH */ #ifndef OPENSSL_NO_TLSEXT - case SSL_CTRL_SET_TLSEXT_DEBUG_ARG: - s->tlsext_debug_arg=parg; - ret = 1; - break; #ifdef TLSEXT_TYPE_opaque_prf_input case SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT: @@ -1800,7 +1800,6 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) #ifndef OPENSSL_NO_TLSEXT #define SSL_CTRL_SET_TLSEXT_SERVERNAME_CB 53 #define SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG 54 -#define SSL_CTRL_SET_TLSEXT_DEBUG_ARG 57 #define SSL_CTRL_GET_TLSEXT_TICKET_KEYS 58 #define SSL_CTRL_SET_TLSEXT_TICKET_KEYS 59 #define SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT 60 diff --git a/ssl/tls1.h b/ssl/tls1.h index 135d8bfce0..f8afcbbde7 100644 --- a/ssl/tls1.h +++ b/ssl/tls1.h @@ -341,11 +341,9 @@ int SSL_set_tlsext_host_name(SSL *s, const char *name); void SSL_set_tlsext_debug_callback(SSL *s, void (*cb)(SSL *, int ,int, unsigned char *, int, void *)); +void SSL_set_tlsext_debug_arg(SSL *s, void *arg); #endif /* ndef OPENSSL_NO_TLSEXT */ -#define SSL_set_tlsext_debug_arg(ssl, arg) \ -SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_ARG,0, (void *)arg) - #define SSL_set_tlsext_status_type(ssl, type) \ SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE,type, NULL) |