Clarify comment and add #ifdef.

[openssl.git] / ssl / s3_lib.c

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 94bdb63cdb2ab0052fc076c745f7282ce8844e92..bfb70515b0e53d5a3f11358e69b2e3f4fdbd5298 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -2043,11 +2043,12 @@ 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,j,ok;
+       int i,ii,ok;
+       unsigned int j;
 #ifndef OPENSSL_NO_TLSEXT
 #ifndef OPENSSL_NO_EC
        int ec_ok, ec_nid;
-       unsigned char ec_search1, ec_search2;
+       unsigned char ec_search1 = 0, ec_search2 = 0;
 #endif /* OPENSSL_NO_EC */
 #endif /* OPENSSL_NO_TLSEXT */
        CERT *cert;
@@ -2290,10 +2291,10 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
 #endif /* OPENSSL_NO_TLSEXT */
 
                if (!ok) continue;
-               j=sk_SSL_CIPHER_find(allow,c);
-               if (j >= 0)
+               ii=sk_SSL_CIPHER_find(allow,c);
+               if (ii >= 0)
                        {
-                       ret=sk_SSL_CIPHER_value(allow,j);
+                       ret=sk_SSL_CIPHER_value(allow,ii);
                        break;
                        }
                }