diff options
| author | Ben Laurie <ben@links.org> | 2014-07-06 07:50:55 +0100 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2014-07-06 10:09:16 +0100 |
| commit | 09e1da4ed10b48b2df23b9dec9e0d28afe74d236 (patch) | |
| tree | 2c9b9cd5f0db5ed01760111350ffe371defbbcc1 | |
| parent | 127c4488b24ade391cddcd21af77a7e416f20f24 (diff) | |
| download | openssl-new-09e1da4ed10b48b2df23b9dec9e0d28afe74d236.tar.gz | |
Make SSL_set_tlsext_status_exts() and SSL_get_tlsext_status_ids() real functions.
| -rw-r--r-- | ssl/s3_lib.c | 22 | ||||
| -rw-r--r-- | ssl/ssl.h | 2 | ||||
| -rw-r--r-- | ssl/tls1.h | 10 |
3 files changed, 14 insertions, 20 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index de38621a9f..f0582d760d 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3364,7 +3364,7 @@ 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, +void SSL_set_tlsext_debug_callback(SSL *s, void (*cb)(SSL *, int, int, unsigned char *, int, void *)) { @@ -3386,6 +3386,16 @@ void SSL_get_tlsext_status_exts(SSL *s, STACK_OF(X509_EXTENSION) **exts) *exts = s->tlsext_ocsp_exts; } +void SSL_set_tlsext_status_exts(SSL *s, STACK_OF(X509_EXTENSION) *exts) + { + s->tlsext_ocsp_exts = exts; + } + +void SSL_get_tlsext_status_ids(SSL *s, STACK_OF(OCSP_RESPID) **ids) + { + *ids = s->tlsext_ocsp_ids; + } + #endif /* ndef OPENSSL_NO_TLSEXT */ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) @@ -3574,16 +3584,6 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) break; #endif - case SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS: - s->tlsext_ocsp_exts = parg; - ret = 1; - break; - - case SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS: - *(STACK_OF(OCSP_RESPID) **)parg = s->tlsext_ocsp_ids; - ret = 1; - break; - case SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS: s->tlsext_ocsp_ids = parg; ret = 1; @@ -1807,8 +1807,6 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) #define SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB_ARG 62 #define SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB 63 #define SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG 64 -#define SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS 67 -#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS 68 #define SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS 69 #define SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP 70 #define SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP 71 diff --git a/ssl/tls1.h b/ssl/tls1.h index 71a2026ec7..d7643c8778 100644 --- a/ssl/tls1.h +++ b/ssl/tls1.h @@ -340,20 +340,16 @@ 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, +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); void SSL_set_tlsext_status_type(SSL *s, enum tlsext_statustype type); void SSL_get_tlsext_status_exts(SSL *s, STACK_OF(X509_EXTENSION) **exts); +void SSL_set_tlsext_status_exts(SSL *s, STACK_OF(X509_EXTENSION) *exts); +void SSL_get_tlsext_status_ids(SSL *s, STACK_OF(OCSP_RESPID) **ids); #endif /* ndef OPENSSL_NO_TLSEXT */ -#define SSL_set_tlsext_status_exts(ssl, arg) \ -SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS,0, (void *)arg) - -#define SSL_get_tlsext_status_ids(ssl, arg) \ -SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS,0, (void *)arg) - #define SSL_set_tlsext_status_ids(ssl, arg) \ SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS,0, (void *)arg) |