|
Lines 794-801
static int ssl_sock_load_ocsp(SSL_CTX *c
Link Here
|
| 794 |
ocsp = NULL; |
795 |
ocsp = NULL; |
| 795 |
|
796 |
|
| 796 |
#ifndef SSL_CTX_get_tlsext_status_cb |
797 |
#ifndef SSL_CTX_get_tlsext_status_cb |
| 797 |
# define SSL_CTX_get_tlsext_status_cb(ctx, cb) \ |
798 |
#ifndef SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB |
| 798 |
*cb = (void (*) (void))ctx->tlsext_status_cb; |
799 |
#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB 128 |
|
|
800 |
#endif |
| 801 |
#define SSL_CTX_get_tlsext_status_cb(ctx, cb) \ |
| 802 |
*cb = SSL_CTX_ctrl(ctx,SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB,0, (void (**)(void))cb) |
| 799 |
#endif |
803 |
#endif |
| 800 |
SSL_CTX_get_tlsext_status_cb(ctx, &callback); |
804 |
SSL_CTX_get_tlsext_status_cb(ctx, &callback); |
| 801 |
|
805 |
|
|
Lines 823-829
static int ssl_sock_load_ocsp(SSL_CTX *c
Link Here
|
| 823 |
int key_type; |
827 |
int key_type; |
| 824 |
EVP_PKEY *pkey; |
828 |
EVP_PKEY *pkey; |
| 825 |
|
829 |
|
| 826 |
#ifdef SSL_CTX_get_tlsext_status_arg |
830 |
#if defined(SSL_CTX_get_tlsext_status_arg) || defined(LIBRESSL_VERSION_NUMBER) |
|
|
831 |
#ifndef SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG |
| 832 |
#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG 129 |
| 833 |
#endif |
| 827 |
SSL_CTX_ctrl(ctx, SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG, 0, &cb_arg); |
834 |
SSL_CTX_ctrl(ctx, SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG, 0, &cb_arg); |
| 828 |
#else |
835 |
#else |
| 829 |
cb_arg = ctx->tlsext_status_arg; |
836 |
cb_arg = ctx->tlsext_status_arg; |
|
Lines 3539-3545
int ssl_sock_handshake(struct connection
Link Here
|
| 3539 |
OSSL_HANDSHAKE_STATE state = SSL_get_state((SSL *)conn->xprt_ctx); |
3546 |
OSSL_HANDSHAKE_STATE state = SSL_get_state((SSL *)conn->xprt_ctx); |
| 3540 |
empty_handshake = state == TLS_ST_BEFORE; |
3547 |
empty_handshake = state == TLS_ST_BEFORE; |
| 3541 |
#else |
3548 |
#else |
| 3542 |
empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length; |
3549 |
empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE; |
| 3543 |
#endif |
3550 |
#endif |
| 3544 |
|
3551 |
|
| 3545 |
if (empty_handshake) { |
3552 |
if (empty_handshake) { |
|
Lines 3617-3623
int ssl_sock_handshake(struct connection
Link Here
|
| 3617 |
state = SSL_get_state((SSL *)conn->xprt_ctx); |
3624 |
state = SSL_get_state((SSL *)conn->xprt_ctx); |
| 3618 |
empty_handshake = state == TLS_ST_BEFORE; |
3625 |
empty_handshake = state == TLS_ST_BEFORE; |
| 3619 |
#else |
3626 |
#else |
| 3620 |
empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length; |
3627 |
empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE; |
| 3621 |
#endif |
3628 |
#endif |
| 3622 |
if (empty_handshake) { |
3629 |
if (empty_handshake) { |
| 3623 |
if (!errno) { |
3630 |
if (!errno) { |