--- src/ssl_sock.c.orig	2017-01-13 09:03:00 UTC

+++ src/ssl_sock.c

@@ -793,7 +793,7 @@ static int ssl_sock_load_ocsp(SSL_CTX *c

 #ifndef SSL_CTX_get_tlsext_status_cb

 # define SSL_CTX_get_tlsext_status_cb(ctx, cb) \

-	*cb = (void (*) (void))ctx->tlsext_status_cb;

+	*cb = SSL_CTX_ctrl(ctx,128,0, (void (**)(void))cb)

 #endif

 	SSL_CTX_get_tlsext_status_cb(ctx, &callback);

@@ -821,7 +821,10 @@ static int ssl_sock_load_ocsp(SSL_CTX *c

 		int key_type;

 		EVP_PKEY *pkey;

-#ifdef SSL_CTX_get_tlsext_status_arg

+#if defined(SSL_CTX_get_tlsext_status_arg) || defined(LIBRESSL_VERSION_NUMBER)

+#ifndef SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG

+#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG 129

+#endif

 		SSL_CTX_ctrl(ctx, SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG, 0, &cb_arg);

 #else

 		cb_arg = ctx->tlsext_status_arg;

@@ -3537,7 +3540,7 @@ int ssl_sock_handshake(struct connection

 					OSSL_HANDSHAKE_STATE state = SSL_get_state((SSL *)conn->xprt_ctx);

 					empty_handshake = state == TLS_ST_BEFORE;

 #else

-					empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length;

+					empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE;

 #endif

 					if (empty_handshake) {

@@ -3615,7 +3618,7 @@ int ssl_sock_handshake(struct connection

 			state = SSL_get_state((SSL *)conn->xprt_ctx);

 			empty_handshake = state == TLS_ST_BEFORE;

 #else

-			empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length;

+			empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE;

 #endif

 			if (empty_handshake) {

 				if (!errno) {