You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@serf.apache.org by st...@apache.org on 2016/12/20 10:11:32 UTC

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

Author: stsp
Date: Tue Dec 20 10:11:32 2016
New Revision: 1775246

URL: http://svn.apache.org/viewvc?rev=1775246&view=rev
Log:
Follow-up to r1775240:

* buckets/ssl_buckets.c
  (detect_renegotiate): Fix the check for supported macros such that
   TLS_ST_SW_HELLO_REQ wins over SSL_ST_RENEGOTIATE if both are defined.

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=1775246&r1=1775245&r2=1775246&view=diff
==============================================================================
--- serf/trunk/buckets/ssl_buckets.c (original)
+++ serf/trunk/buckets/ssl_buckets.c Tue Dec 20 10:11:32 2016
@@ -300,10 +300,12 @@ detect_renegotiate(const SSL *s, int whe
 #endif
 
     /* The server asked to renegotiate the SSL session. */
-#ifndef SSL_ST_RENEGOTIATE
+#ifdef TLS_ST_SW_HELLO_REQ
     if (SSL_get_state(s) == TLS_ST_SW_HELLO_REQ) {
-#else
+#elif defined(SSL_ST_RENEGOTIATE)
     if (SSL_state(s) == SSL_ST_RENEGOTIATE) {
+#else
+#error "neither TLS_ST_SW_HELLO_REQ nor SSL_ST_RENEGOTIATE is available"
 #endif
         serf_ssl_context_t *ssl_ctx = SSL_get_app_data(s);