Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 608398
Collapse All | Expand All

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

Return to bug 608398