From 304f8dc48fa601ebe490dd756159b18292cdc6b5 Mon Sep 17 00:00:00 2001 From: lukas-nowak <103440038+lukas-nowak@users.noreply.github.com> Date: Fri, 14 Oct 2022 03:54:40 +0200 Subject: [PATCH] conditional compilation removed from macro expansion to satisfy MSVC (#3264) --- pjlib/src/pj/ssl_sock_ossl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c index ad9c9fa46..9170f986c 100644 --- a/pjlib/src/pj/ssl_sock_ossl.c +++ b/pjlib/src/pj/ssl_sock_ossl.c @@ -2357,15 +2357,19 @@ static pj_status_t ssl_do_handshake(pj_ssl_sock_t *ssock) sess = SSL_get_session(ossock->ossl_ssl); +#if OPENSSL_VERSION_NUMBER >= 0x1010100fL PJ_LOG(5, (THIS_FILE, "Session info: reused=%d, resumable=%d, " "timeout=%d", SSL_session_reused(ossock->ossl_ssl), -#if OPENSSL_VERSION_NUMBER >= 0x1010100fL SSL_SESSION_is_resumable(sess), + SSL_SESSION_get_timeout(sess))); #else + PJ_LOG(5, (THIS_FILE, "Session info: reused=%d, resumable=%d, " + "timeout=%d", + SSL_session_reused(ossock->ossl_ssl), -1, -#endif SSL_SESSION_get_timeout(sess))); +#endif sid = SSL_SESSION_get_id(sess, &len); len *= 2;