diff options
| author | Ben Laurie <ben@links.org> | 2014-07-06 07:22:56 +0100 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2014-07-06 10:09:16 +0100 |
| commit | fa7fbb6b5a48ab814db03c49f153a5f78369bef2 (patch) | |
| tree | 7c0669663f7470d72b43f248ccf90dbae562bb67 | |
| parent | df7b865f0a2e5ff819488d5626cda7e55d14d250 (diff) | |
| download | openssl-new-fa7fbb6b5a48ab814db03c49f153a5f78369bef2.tar.gz | |
Make SSL_set_tlsext_debug_callback() a real function.
| -rw-r--r-- | ssl/s3_lib.c | 17 | ||||
| -rw-r--r-- | ssl/ssl.h | 1 | ||||
| -rw-r--r-- | ssl/tls1.h | 6 |
3 files changed, 14 insertions, 10 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 33f0e479cb..072875b758 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3338,6 +3338,8 @@ static char * MS_CALLBACK srp_password_from_info_cb(SSL *s, void *arg) static int ssl3_set_req_cert_type(CERT *c, const unsigned char *p, size_t len); +#ifndef OPENSSL_NO_TLSEXT + int SSL_set_tlsext_host_name(SSL *s, const char *name) { if (s->tlsext_hostname != NULL) @@ -3362,6 +3364,15 @@ int SSL_set_tlsext_host_name(SSL *s, const char *name) return 1; } +void SSL_set_tlsext_debug_callback(SSL *s, void (*cb)(SSL *, int ,int, + unsigned char *, int, + void *)) + { + s->tlsext_debug_cb = cb; + } + +#endif /* ndef OPENSSL_NO_TLSEXT */ + long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) { int ret=0; @@ -3859,12 +3870,6 @@ long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp)(void)) } break; #endif -#ifndef OPENSSL_NO_TLSEXT - case SSL_CTRL_SET_TLSEXT_DEBUG_CB: - s->tlsext_debug_cb=(void (*)(SSL *,int ,int, - unsigned char *, int, void *))fp; - break; -#endif case SSL_CTRL_SET_NOT_RESUMABLE_SESS_CB: { s->not_resumable_session_cb = (int (*)(SSL *, int))fp; @@ -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_CB 56 #define SSL_CTRL_SET_TLSEXT_DEBUG_ARG 57 #define SSL_CTRL_GET_TLSEXT_TICKET_KEYS 58 #define SSL_CTRL_SET_TLSEXT_TICKET_KEYS 59 diff --git a/ssl/tls1.h b/ssl/tls1.h index 9f97d8e629..135d8bfce0 100644 --- a/ssl/tls1.h +++ b/ssl/tls1.h @@ -338,11 +338,11 @@ int SSL_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain); #ifndef OPENSSL_NO_TLSEXT 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 *)); #endif /* ndef OPENSSL_NO_TLSEXT */ -#define SSL_set_tlsext_debug_callback(ssl, cb) \ -SSL_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_CB,(void (*)(void))cb) - #define SSL_set_tlsext_debug_arg(ssl, arg) \ SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_ARG,0, (void *)arg) |