0.9.8 version of PR#1931 fix.

[oweals/openssl.git] / ssl / s2_lib.c

diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c
index 8dda67e8978e08ab43dea5eaeba7913cf080d2ff..10751b22baf8fe4cfb4abcd794076e025d72e78a 100644 (file)
--- a/ssl/s2_lib.c
+++ b/ssl/s2_lib.c
@@ -63,7 +63,7 @@
 #include <openssl/evp.h>
 #include <openssl/md5.h>
 
-const char *ssl2_version_str="SSLv2" OPENSSL_VERSION_PTEXT;
+const char ssl2_version_str[]="SSLv2" OPENSSL_VERSION_PTEXT;
 
 #define SSL2_NUM_CIPHERS (sizeof(ssl2_ciphers)/sizeof(SSL_CIPHER))
 
@@ -178,7 +178,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl2_ciphers[]={
        SSL_ALL_STRENGTHS,
        },
 /* RC4_64_WITH_MD5 */
-#if 1
+#if 0
        {
        1,
        SSL2_TXT_RC4_64_WITH_MD5,
@@ -341,7 +341,6 @@ SSL_CIPHER *ssl2_get_cipher_by_char(const unsigned char *p)
        {
        SSL_CIPHER c,*cp;
        unsigned long id;
-       unsigned int i;
 
        id=0x02000000L|((unsigned long)p[0]<<16L)|
                ((unsigned long)p[1]<<8L)|(unsigned long)p[2];