Fix compilation with no-ec and/or no-tlsext.
authorRob Stradling <rob@comodo.com>
Tue, 10 Sep 2013 11:20:29 +0000 (12:20 +0100)
committerBen Laurie <ben@links.org>
Fri, 13 Sep 2013 15:24:22 +0000 (16:24 +0100)
ssl/s3_lib.c

index 321db08..331c4e6 100644 (file)
@@ -4156,15 +4156,15 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
                ii=sk_SSL_CIPHER_find(allow,c);
                if (ii >= 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 (!ret) ret=sk_SSL_CIPHER_value(allow,ii);
+                               continue;
                                }
-                       else
-                               {
-                               ret=sk_SSL_CIPHER_value(allow,ii);
-                               break;
-                               }
+#endif
+                       ret=sk_SSL_CIPHER_value(allow,ii);
+                       break;
                        }
                }
        return(ret);