Commit 5fa3b547 authored by Rob Stradling's avatar Rob Stradling Committed by Ben Laurie
Browse files

Fix compilation with no-ec and/or no-tlsext.

parent 07df5018

ssl/s3_lib.c

+5 −5
Original line number Diff line number Diff line
@@ -4132,17 +4132,17 @@ 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

				{

#endif

			ret=sk_SSL_CIPHER_value(allow,ii);

			break;

			}

		}

		}

	return(ret);

	}