More prototypes.

[openssl.git] / ssl / s2_lib.c

diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c
index fb91582217047e256584b0b88cee711be67ed3f8..12b8458a584c4603e1903e348a8aeffcf88f22d7 100644 (file)
--- a/ssl/s2_lib.c
+++ b/ssl/s2_lib.c
@@ -1,5 +1,5 @@
 /* ssl/s2_lib.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -62,14 +62,12 @@
 #include "ssl_locl.h"
 
 #ifndef NOPROTO
-static int ssl2_ok(SSL *s);
 static long ssl2_default_timeout(void );
 #else
-static int ssl2_ok();
 static long ssl2_default_timeout();
 #endif
 
-char *ssl2_version_str="SSLv2 part of SSLeay 0.8.1b 29-Jun-1998";
+char *ssl2_version_str="SSLv2 part of OpenSSL 0.9.2 31-Dec-1998";
 
 #define SSL2_NUM_CIPHERS (sizeof(ssl2_ciphers)/sizeof(SSL_CIPHER))
 
@@ -139,17 +137,6 @@ SSL_CIPHER ssl2_ciphers[]={
        0,
        SSL_ALL_CIPHERS,
        },
-/* DES_64_CBC_WITH_SHA */
-#if 0
-       {
-       1,
-       SSL2_TXT_DES_64_CBC_WITH_SHA,
-       SSL2_CK_DES_64_CBC_WITH_SHA,
-       SSL_kRSA|SSL_aRSA|SSL_DES|SSL_SHA0|SSL_NOT_EXP|SSL_SSLV2|SSL_LOW,
-       0,
-       SSL_ALL_CIPHERS,
-       },
-#endif
 /* DES_192_EDE3_CBC_WITH_MD5 */
        {
        1,
@@ -159,17 +146,6 @@ SSL_CIPHER ssl2_ciphers[]={
        0,
        SSL_ALL_CIPHERS,
        },
-/* DES_192_EDE3_CBC_WITH_SHA */
-#if 0
-       {
-       1,
-       SSL2_TXT_DES_192_EDE3_CBC_WITH_SHA,
-       SSL2_CK_DES_192_EDE3_CBC_WITH_SHA,
-       SSL_kRSA|SSL_aRSA|SSL_3DES|SSL_SHA0|SSL_NOT_EXP|SSL_SSLV2|SSL_HIGH,
-       0,
-       SSL_ALL_CIPHERS,
-       },
-#endif
 /* RC4_64_WITH_MD5 */
 #if 1
        {
@@ -196,7 +172,7 @@ SSL_CIPHER ssl2_ciphers[]={
        };
 
 static SSL_METHOD SSLv2_data= {
-       2,
+       SSL2_VERSION,
        ssl2_new,       /* local */
        ssl2_clear,     /* local */
        ssl2_free,      /* local */
@@ -206,7 +182,8 @@ static SSL_METHOD SSLv2_data= {
        ssl2_peek,
        ssl2_write,
        ssl2_shutdown,
-       ssl2_ok,
+       ssl_ok, /* NULL - renegotiate */
+       ssl_ok, /* NULL - check renegotiate */
        ssl2_ctrl,      /* local */
        ssl2_ctx_ctrl,  /* local */
        ssl2_get_cipher_by_char,
@@ -216,6 +193,7 @@ static SSL_METHOD SSLv2_data= {
        ssl2_get_cipher,
        ssl_bad_method,
        ssl2_default_timeout,
+       &ssl3_undef_enc_method,
        };
 
 static long ssl2_default_timeout()
@@ -254,6 +232,7 @@ SSL *s;
        SSL2_CTX *s2;
 
        if ((s2=(SSL2_CTX *)Malloc(sizeof(SSL2_CTX))) == NULL) goto err;
+       memset(s2,0,sizeof(SSL2_CTX));
 
        if ((s2->rbuf=(unsigned char *)Malloc(
                SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER+2)) == NULL) goto err;
@@ -278,6 +257,9 @@ SSL *s;
        {
        SSL2_CTX *s2;
 
+       if(s == NULL)
+           return;
+
        s2=s->s2;
        if (s2->rbuf != NULL) Free(s2->rbuf);
        if (s2->wbuf != NULL) Free(s2->wbuf);
@@ -302,9 +284,8 @@ SSL *s;
        s2->rbuf=rbuf;
        s2->wbuf=wbuf;
        s2->clear_text=1;
-       s2->first_packet=0;
        s->packet=s2->rbuf;
-       s->version=2;
+       s->version=SSL2_VERSION;
        s->packet_length=0;
        }
 
@@ -314,7 +295,17 @@ int cmd;
 long larg;
 char *parg;
        {
-       return(0);
+       int ret=0;
+
+       switch(cmd)
+               {
+       case SSL_CTRL_GET_SESSION_REUSED:
+               ret=s->hit;
+               break;
+       default:
+               break;
+               }
+       return(ret);
        }
 
 long ssl2_ctx_ctrl(ctx,cmd,larg,parg)
@@ -329,7 +320,7 @@ char *parg;
 /* This function needs to check if the ciphers required are actually
  * available */
 SSL_CIPHER *ssl2_get_cipher_by_char(p)
-unsigned char *p;
+const unsigned char *p;
        {
        static int init=1;
        static SSL_CIPHER *sorted[SSL2_NUM_CIPHERS];
@@ -363,7 +354,7 @@ unsigned char *p;
        }
 
 int ssl2_put_cipher_by_char(c,p)
-SSL_CIPHER *c;
+const SSL_CIPHER *c;
 unsigned char *p;
        {
        long l;
@@ -440,12 +431,6 @@ SSL *s;
                s->error=0; */
        }
 
-static int ssl2_ok(s)
-SSL *s;
-       {
-       return(1);
-       }
-
 int ssl2_shutdown(s)
 SSL *s;
        {