Tidy up comments.
authorRob Stradling <rob@comodo.com>
Tue, 10 Sep 2013 11:25:57 +0000 (12:25 +0100)
committerBen Laurie <ben@links.org>
Fri, 13 Sep 2013 15:24:22 +0000 (16:24 +0100)
ssl/s3_lib.c
ssl/ssl3.h
ssl/t1_lib.c

index 331c4e631adb29e2ac211d57fedef0200e3e7847..618f53d73d46b372fa4934adce62f7d1aac00c7b 100644 (file)
@@ -3084,8 +3084,8 @@ void ssl3_clear(SSL *s)
        s->s3->tlsext_custom_types_count = 0;   
 #ifndef OPENSSL_NO_EC
        s->s3->is_probably_safari = 0;
-#endif /* OPENSSL_NO_EC */
-#endif /* OPENSSL_NO_TLSEXT */
+#endif /* !OPENSSL_NO_EC */
+#endif /* !OPENSSL_NO_TLSEXT */
 
        rp = s->s3->rbuf.buf;
        wp = s->s3->wbuf.buf;
index 5fd02791faa8de4c064fd99f736b2ca0899e1c1c..f49e1c8c7641369c1760736dc34fb86db073e95b 100644 (file)
@@ -590,9 +590,9 @@ typedef struct ssl3_state_st
         * running on OS X 10.6 or newer. We wish to know this because Safari
         * on 10.8 .. 10.8.3 has broken ECDHE-ECDSA support. */
        char is_probably_safari;
-#endif /* OPENSSL_NO_EC */
+#endif /* !OPENSSL_NO_EC */
 
-#endif /* OPENSSL_NO_TLSEXT */
+#endif /* !OPENSSL_NO_TLSEXT */
        } SSL3_STATE;
 
 #endif
index c46e71179ac53482c0b59736c6c28f7c7c642613..e07e8c687cf48b7060c12e5783ae0851f6cf199f 100644 (file)
@@ -1893,7 +1893,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data, const unsign
 
        s->s3->is_probably_safari = 1;
 }
-#endif /* OPENSSL_NO_EC */
+#endif /* !OPENSSL_NO_EC */
 
 static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, int n, int *al) 
        {       
@@ -1932,7 +1932,7 @@ static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char
 #ifndef OPENSSL_NO_EC
        if (s->options & SSL_OP_SAFARI_ECDHE_ECDSA_BUG)
                ssl_check_for_safari(s, data, d, n);
-#endif /* OPENSSL_NO_EC */
+#endif /* !OPENSSL_NO_EC */
 
        /* Clear any signature algorithms extension received */
        if (s->cert->peer_sigalgs)