X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Fs3_lib.c;h=fc723a00a9759a637f54dd0c71174f02870e97a0;hb=0b8cd5acd6616888a3cde85d6127c93894dfe797;hp=bdfb26db20bea0b2827ca7f1c2532ac4d897e316;hpb=cadbbd51c8b4e66515cd3e97754cfeda606c7b15;p=oweals%2Fopenssl.git

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index bdfb26db20..fc723a00a9 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -1737,8 +1737,8 @@ void ssl3_clear(SSL *s)
 #ifndef OPENSSL_NO_TLSEXT
 #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;
@@ -2404,7 +2404,7 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
 		if (j >= 0)
 			{
 #if !defined(OPENSSL_NO_EC) && !defined(OPENSSL_NO_TLSEXT)
-			if ((alg_k & SSL_kEECDH) && (alg_a & SSL_aECDSA) && s->s3->is_probably_safari)
+			if ((alg & SSL_kECDHE) && (alg & SSL_aECDSA) && s->s3->is_probably_safari)
 				{
 				if (!ret) ret=sk_SSL_CIPHER_value(allow,j);
 				continue;