Attachment #572986 for bug #682894

View | Details | Raw Unified | Return to bug 682894
Collapse All | Expand All




NOEXPORT int ui_retry();

/* session tickets */
#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
NOEXPORT int generate_session_ticket_cb(SSL *, void *);
NOEXPORT int decrypt_session_ticket_cb(SSL *, SSL_SESSION *,
    const unsigned char *, size_t, SSL_TICKET_STATUS, void *);

        }
    }
#if (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2090000fL) && !defined(OPENSSL_NO_TLS1_3)
    /* ciphersuites */
    if(section->ciphersuites) {
        s_log(LOG_DEBUG, "TLSv1.3 ciphersuites: %s", section->ciphersuites);

#endif

    /* setup session tickets */
#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
    SSL_CTX_set_session_ticket_cb(section->ctx, generate_session_ticket_cb,
        decrypt_session_ticket_cb, NULL);
#endif /* OpenSSL 1.1.1 or later */


/**************************************** session tickets */

#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)

typedef struct {
    void *session_authenticated;

Lines 680-686 Link Here

(-)a/src/client.c (-1 / +1 lines)
680	}	680	}
681		681
682	/****************************** wait for an event */	682	/****************************** wait for an event */
683	#if OPENSSL_VERSION_NUMBER >= 0x10100000L	683	#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
684	pending=SSL_pending(c->ssl) \|\| SSL_has_pending(c->ssl);	684	pending=SSL_pending(c->ssl) \|\| SSL_has_pending(c->ssl);
685	#else	685	#else
686	pending=SSL_pending(c->ssl);	686	pending=SSL_pending(c->ssl);

Return to bug 682894

Lines 91-97 Link Here

(-)a/src/ctx.c (-4 / +4 lines)
91	NOEXPORT int ui_retry();	91	NOEXPORT int ui_retry();
92		92
93	/* session tickets */	93	/* session tickets */
94	#if OPENSSL_VERSION_NUMBER >= 0x10101000L	94	#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
95	NOEXPORT int generate_session_ticket_cb(SSL , void );	95	NOEXPORT int generate_session_ticket_cb(SSL , void );
96	NOEXPORT int decrypt_session_ticket_cb(SSL , SSL_SESSION ,	96	NOEXPORT int decrypt_session_ticket_cb(SSL , SSL_SESSION ,
97	const unsigned char , size_t, SSL_TICKET_STATUS, void );	97	const unsigned char , size_t, SSL_TICKET_STATUS, void );
Lines 176-182 Link Here
176	}	176	}
177	}	177	}
178	#ifndef OPENSSL_NO_TLS1_3	178	#if (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2090000fL) && !defined(OPENSSL_NO_TLS1_3)
179	/* ciphersuites */	179	/* ciphersuites */
180	if(section->ciphersuites) {	180	if(section->ciphersuites) {
181	s_log(LOG_DEBUG, "TLSv1.3 ciphersuites: %s", section->ciphersuites);	181	s_log(LOG_DEBUG, "TLSv1.3 ciphersuites: %s", section->ciphersuites);
Lines 229-235 Link Here
229	#endif	230	#endif
230		231
231	/* setup session tickets */	232	/* setup session tickets */
232	#if OPENSSL_VERSION_NUMBER >= 0x10101000L	233	#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
233	SSL_CTX_set_session_ticket_cb(section->ctx, generate_session_ticket_cb,	234	SSL_CTX_set_session_ticket_cb(section->ctx, generate_session_ticket_cb,
234	decrypt_session_ticket_cb, NULL);	235	decrypt_session_ticket_cb, NULL);
235	#endif /* OpenSSL 1.1.1 or later */	236	#endif /* OpenSSL 1.1.1 or later */
Lines 969-975 Link Here
969		970
970	/**************************************** session tickets */	971	/**************************************** session tickets */
971		972
972	#if OPENSSL_VERSION_NUMBER >= 0x10101000L	973	#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
973		974
974	typedef struct {	975	typedef struct {
975	void *session_authenticated;	976	void *session_authenticated;