svn commit: r1775241 - /serf/trunk/buckets/ssl_buckets.c

[st...@apache.org]

Author: stsp
Date: Tue Dec 20 09:52:54 2016
New Revision: 1775241

URL: http://svn.apache.org/viewvc?rev=1775241&view=rev
Log:
Fix another build problem with LibreSSL.

* buckets/ssl_buckets.c
  (ssl_decrypt): Check for required macros directly instead of blindly
   assuming they are available as of a particular version of OpenSSL.

Modified:
    serf/trunk/buckets/ssl_buckets.c

Modified: serf/trunk/buckets/ssl_buckets.c
URL: http://svn.apache.org/viewvc/serf/trunk/buckets/ssl_buckets.c?rev=1775241&r1=1775240&r2=1775241&view=diff
==============================================================================
--- serf/trunk/buckets/ssl_buckets.c (original)
+++ serf/trunk/buckets/ssl_buckets.c Tue Dec 20 09:52:54 2016
@@ -1110,11 +1110,13 @@ static apr_status_t ssl_decrypt(void *ba
         /* Once we got through the initial handshake, we should have received
            the ALPN information if there is such information. */
         ctx->handshake_finished = SSL_is_init_finished(ctx->ssl)
-#ifndef USE_LEGACY_OPENSSL
+#ifdef TLS_ST_OK
                                   || (SSL_get_state(ctx->ssl) == TLS_ST_OK);
-#else
+#elif defined(SSL_CB_HANDSHAKE_DONE)
                                   || (SSL_state(ctx->ssl)
                                       & SSL_CB_HANDSHAKE_DONE);
+#else
+#error "neither TLS_ST_OK nor SSL_CB_HANDSHAKE_DONE is available"
 #endif
 
         /* Call the protocol callback as soon as possible as this triggers