summaryrefslogtreecommitdiffstats
path: root/ssl/s3_lib.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-04-23 15:24:27 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-04-23 15:24:27 +0000
commit82ae57136b93ff8a39bc32a52d7b5fb41502a8c2 (patch)
tree39728f74d88d3f060bc992d3440f19637ec1f999 /ssl/s3_lib.c
parent30baeaaeab4ea577c72d83009b0bfbf9d537df41 (diff)
Some no-ec fixes (not complete yet).
Diffstat (limited to 'ssl/s3_lib.c')
-rw-r--r--ssl/s3_lib.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 73a573ee29..51ec94b5b1 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -2821,13 +2821,11 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
SSL_CIPHER *c,*ret=NULL;
STACK_OF(SSL_CIPHER) *prio, *allow;
int i,ii,ok;
-#ifndef OPENSSL_NO_TLSEXT
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_EC)
unsigned int j;
-#ifndef OPENSSL_NO_EC
int ec_ok, ec_nid;
unsigned char ec_search1 = 0, ec_search2 = 0;
-#endif /* OPENSSL_NO_EC */
-#endif /* OPENSSL_NO_TLSEXT */
+#endif
CERT *cert;
unsigned long alg_k,alg_a,mask_k,mask_a,emask_k,emask_a;