diff options
| author | Ben Laurie <ben@links.org> | 2014-07-06 10:14:55 +0100 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2014-07-06 10:14:55 +0100 |
| commit | 19903a1ccebc6b3662ec23cb1044850078a72a55 (patch) | |
| tree | d093cdcddb665cdf45639060390b82697ae9a87e | |
| parent | 09e1da4ed10b48b2df23b9dec9e0d28afe74d236 (diff) | |
| download | openssl-new-19903a1ccebc6b3662ec23cb1044850078a72a55.tar.gz | |
Make SSL_set_tlsext_status_ids() a real function.
| -rw-r--r-- | ssl/s3_lib.c | 10 | ||||
| -rw-r--r-- | ssl/ssl.h | 1 | ||||
| -rw-r--r-- | ssl/tls1.h | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index f0582d760d..87d09af861 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3396,6 +3396,11 @@ void SSL_get_tlsext_status_ids(SSL *s, STACK_OF(OCSP_RESPID) **ids) *ids = s->tlsext_ocsp_ids; } +void SSL_set_tlsext_status_ids(SSL *s, STACK_OF(OCSP_RESPID) *ids) + { + s->tlsext_ocsp_ids = ids; + } + #endif /* ndef OPENSSL_NO_TLSEXT */ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) @@ -3584,11 +3589,6 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) break; #endif - case SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS: - s->tlsext_ocsp_ids = parg; - ret = 1; - break; - case SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP: *(unsigned char **)parg = s->tlsext_ocsp_resp; return s->tlsext_ocsp_resplen; @@ -1807,7 +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_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 d7643c8778..3dcccbbda4 100644 --- a/ssl/tls1.h +++ b/ssl/tls1.h @@ -348,11 +348,9 @@ 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); +void SSL_set_tlsext_status_ids(SSL *s, STACK_OF(OCSP_RESPID) *ids); #endif /* ndef OPENSSL_NO_TLSEXT */ -#define SSL_set_tlsext_status_ids(ssl, arg) \ -SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS,0, (void *)arg) - #define SSL_get_tlsext_status_ocsp_resp(ssl, arg) \ SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP,0, (void *)arg) |