Fix usage message on gendsa:

[openssl.git] / ssl / s2_srvr.c

diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c
index 0112397e536d83390b9649134b1f7ed6ad8b0f6f..73c19af80771b73b94239c89d789ba3f23a81407 100644 (file)
--- a/ssl/s2_srvr.c
+++ b/ssl/s2_srvr.c
@@ -1,5 +1,5 @@
 /* ssl/s2_srvr.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
@@ -57,9 +57,6 @@
  */
 
 #include <stdio.h>
-#ifdef NO_MD5
-#include "md5.h"
-#endif
 #include "bio.h"
 #include "rand.h"
 #include "objects.h"
@@ -67,6 +64,7 @@
 #include "evp.h"
 
 #ifndef NOPROTO
+static SSL_METHOD *ssl2_get_server_method(int ver);
 static int get_client_master_key(SSL *s);
 static int get_client_hello(SSL *s);
 static int server_hello(SSL *s); 
@@ -77,6 +75,7 @@ static int request_certificate(SSL *s);
 static int ssl_rsa_private_decrypt(CERT *c, int len, unsigned char *from,
        unsigned char *to,int padding);
 #else
+static SSL_METHOD *ssl2_get_server_method();
 static int get_client_master_key();
 static int get_client_hello();
 static int server_hello(); 
@@ -92,7 +91,7 @@ static int ssl_rsa_private_decrypt();
 static SSL_METHOD *ssl2_get_server_method(ver)
 int ver;
        {
-       if (ver == 2)
+       if (ver == SSL2_VERSION)
                return(SSLv2_server_method());
        else
                return(NULL);
@@ -124,9 +123,9 @@ SSL *s;
        void (*cb)()=NULL;
        int new_state,state;
 
-       RAND_seed((unsigned char *)&l,sizeof(l));
+       RAND_seed(&l,sizeof(l));
        ERR_clear_error();
-       errno=0;
+       clear_sys_error();
 
        if (s->info_callback != NULL)
                cb=s->info_callback;
@@ -144,7 +143,7 @@ SSL *s;
                return(-1);
                }
 
-       errno=0;
+       clear_sys_error();
        for (;;)
                {
                state=s->state;
@@ -156,9 +155,10 @@ SSL *s;
                case SSL_ST_BEFORE|SSL_ST_ACCEPT:
                case SSL_ST_OK|SSL_ST_ACCEPT:
 
+                       s->server=1;
                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);
 
-                       s->version=2;
+                       s->version=SSL2_VERSION;
                        s->type=SSL_ST_ACCEPT;
 
                        buf=s->init_buf;
@@ -169,7 +169,7 @@ SSL *s;
                                { ret= -1; goto end; }
                        s->init_buf=buf;
                        s->init_num=0;
-                       s->ctx->sess_accept++;
+                       s->ctx->stats.sess_accept++;
                        s->handshake_func=ssl2_accept;
                        s->state=SSL2_ST_GET_CLIENT_HELLO_A;
                        BREAK;
@@ -296,26 +296,27 @@ SSL *s;
 
                case SSL_ST_OK:
                        BUF_MEM_free(s->init_buf);
+                       ssl_free_wbio_buffer(s);
                        s->init_buf=NULL;
                        s->init_num=0;
                /*      ERR_clear_error();*/
 
                        ssl_update_cache(s,SSL_SESS_CACHE_SERVER);
 
-                       s->ctx->sess_accept_good++;
+                       s->ctx->stats.sess_accept_good++;
                        /* s->server=1; */
                        ret=1;
 
                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_DONE,1);
 
                        goto end;
-                       BREAK;
+                       /* BREAK; */
 
                default:
                        SSLerr(SSL_F_SSL2_ACCEPT,SSL_R_UNKNOWN_STATE);
                        ret= -1;
                        goto end;
-                       BREAK;
+                       /* BREAK; */
                        }
                
                if ((cb != NULL) && (s->state != state))
@@ -390,7 +391,7 @@ SSL *s;
        memcpy(s->session->key_arg,&(p[s->s2->tmp.clear+s->s2->tmp.enc]),
                (unsigned int)keya);
 
-       if (s->session->cert->key->privatekey == NULL)
+       if (s->session->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL)
                {
                ssl2_return_error(s,SSL2_PE_UNDEFINED_ERROR);
                SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_NO_PRIVATEKEY);
@@ -400,9 +401,9 @@ SSL *s;
                &(p[s->s2->tmp.clear]),&(p[s->s2->tmp.clear]),
                (s->s2->ssl2_rollback)?RSA_SSLV23_PADDING:RSA_PKCS1_PADDING);
 
-       export=(s->session->cipher->algorithms & SSL_EXP)?1:0;
+       export=SSL_C_IS_EXPORT(s->session->cipher);
        
-       if (!ssl_cipher_get_evp(s->session->cipher,&c,&md))
+       if (!ssl_cipher_get_evp(s->session,&c,&md,NULL))
                {
                ssl2_return_error(s,SSL2_PE_NO_CIPHER);
                SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS);
@@ -537,8 +538,8 @@ SSL *s;
                }
        else
                {
-               i=ssl_get_prev_session(s,s->s2->tmp.session_id_length,
-                       &(p[s->s2->tmp.cipher_spec_length]));
+               i=ssl_get_prev_session(s,&(p[s->s2->tmp.cipher_spec_length]),
+                       s->s2->tmp.session_id_length);
                if (i == 1)
                        { /* previous session */
                        s->hit=1;
@@ -656,9 +657,9 @@ SSL *s;
                        /* put certificate type */
                        *(p++)=SSL2_CT_X509_CERTIFICATE;
                        s2n(s->version,p);      /* version */
-                       n=i2d_X509(s->cert->key->x509,NULL);
+                       n=i2d_X509(s->cert->pkeys[SSL_PKEY_RSA_ENC].x509,NULL);
                        s2n(n,p);               /* certificate length */
-                       i2d_X509(s->cert->key->x509,&d);
+                       i2d_X509(s->cert->pkeys[SSL_PKEY_RSA_ENC].x509,&d);
                        n=0;
                        
                        /* lets send out the ciphers we like in the
@@ -687,23 +688,7 @@ SSL *s;
         */
        if (s->hit)
                {
-               BIO *buf;
- 
-               if (s->bbio == NULL)
-                       {
-                       buf=BIO_new(BIO_f_buffer());
-                       if (buf == NULL)
-                               {
-                               SSLerr(SSL_F_SERVER_HELLO,ERR_LIB_BUF);
-                               return(-1);
-                               }
-                       s->bbio=buf;
-                       }
-               else
-                       buf=s->bbio;
-               
-               BIO_reset(buf);
-               s->wbio=BIO_push(buf,s->wbio);
+               if (!ssl_init_wbio_buffer(s,1)) return(-1);
                }
  
        return(ssl2_do_write(s));
@@ -904,12 +889,12 @@ SSL *s;
                EVP_MD_CTX ctx;
                EVP_PKEY *pkey=NULL;
 
-               EVP_VerifyInit(&ctx,EVP_md5());
+               EVP_VerifyInit(&ctx,s->ctx->rsa_md5);
                EVP_VerifyUpdate(&ctx,s->s2->key_material,
                        (unsigned int)s->s2->key_material_length);
                EVP_VerifyUpdate(&ctx,ccd,SSL2_MIN_CERT_CHALLENGE_LENGTH);
 
-               i=i2d_X509(s->session->cert->key->x509,NULL);
+               i=i2d_X509(s->session->cert->pkeys[SSL_PKEY_RSA_ENC].x509,NULL);
                buf2=(unsigned char *)Malloc((unsigned int)i);
                if (buf2 == NULL)
                        {
@@ -917,13 +902,14 @@ SSL *s;
                        goto msg_end;
                        }
                p2=buf2;
-               i=i2d_X509(s->session->cert->key->x509,&p2);
+               i=i2d_X509(s->session->cert->pkeys[SSL_PKEY_RSA_ENC].x509,&p2);
                EVP_VerifyUpdate(&ctx,buf2,(unsigned int)i);
                Free(buf2);
 
                pkey=X509_get_pubkey(x509);
                if (pkey == NULL) goto end;
                i=EVP_VerifyFinal(&ctx,p,s->s2->tmp.rlen,pkey);
+               EVP_PKEY_free(pkey);
                memset(&ctx,0,sizeof(ctx));
 
                if (i) 
@@ -947,8 +933,8 @@ msg_end:
                ssl2_return_error(s,SSL2_PE_BAD_CERTIFICATE);
                }
 end:
-       if (sk != NULL) sk_free(sk);
-       if (x509 != NULL) X509_free(x509);
+       sk_free(sk);
+       X509_free(x509);
        return(ret);
        }
 
@@ -962,17 +948,17 @@ int padding;
        RSA *rsa;
        int i;
 
-       if ((c == NULL) || (c->key->privatekey == NULL))
+       if ((c == NULL) || (c->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL))
                {
                SSLerr(SSL_F_SSL_RSA_PRIVATE_DECRYPT,SSL_R_NO_PRIVATEKEY);
                return(-1);
                }
-       if (c->key->privatekey->type != EVP_PKEY_RSA)
+       if (c->pkeys[SSL_PKEY_RSA_ENC].privatekey->type != EVP_PKEY_RSA)
                {
                SSLerr(SSL_F_SSL_RSA_PRIVATE_DECRYPT,SSL_R_PUBLIC_KEY_IS_NOT_RSA);
                return(-1);
                }
-       rsa=c->key->privatekey->pkey.rsa;
+       rsa=c->pkeys[SSL_PKEY_RSA_ENC].privatekey->pkey.rsa;
 
        /* we have the public key */
        i=RSA_private_decrypt(len,from,to,rsa,padding);