fix memory leak in s3_clnt.c

[openssl.git] / ssl / s3_clnt.c

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 603de0427394e6b7f8aec93b0bb576c7901e9084..d3e6b4d1e58f96974a07f1045f8583504759af2f 100644 (file)
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -60,6 +60,8 @@
 #include <openssl/buffer.h>
 #include <openssl/rand.h>
 #include <openssl/objects.h>
+#include <openssl/md5.h>
+#include <openssl/sha.h>
 #include <openssl/evp.h>
 #include "ssl_locl.h"
 
@@ -252,6 +254,7 @@ int ssl3_connect(SSL *s)
                case SSL3_ST_CW_CERT_A:
                case SSL3_ST_CW_CERT_B:
                case SSL3_ST_CW_CERT_C:
+               case SSL3_ST_CW_CERT_D:
                        ret=ssl3_send_client_certificate(s);
                        if (ret <= 0) goto end;
                        s->state=SSL3_ST_CW_KEY_EXCH_A;
@@ -677,7 +680,7 @@ static int ssl3_get_server_certificate(SSL *s)
        X509 *x=NULL;
        unsigned char *p,*d,*q;
        STACK_OF(X509) *sk=NULL;
-       CERT *c;
+       SESS_CERT *sc;
        EVP_PKEY *pkey=NULL;
 
        n=ssl3_get_message(s,
@@ -755,20 +758,20 @@ static int ssl3_get_server_certificate(SSL *s)
                }
 
        i=ssl_verify_cert_chain(s,sk);
-        if ((s->verify_mode != SSL_VERIFY_NONE) && (!i))
+       if ((s->verify_mode != SSL_VERIFY_NONE) && (!i))
                {
                al=ssl_verify_alarm_type(s->verify_result);
                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED);
                goto f_err; 
                }
 
-       c=ssl_cert_new();
-       if (c == NULL) goto err;
+       sc=ssl_sess_cert_new();
+       if (sc == NULL) goto err;
 
-       if (s->session->cert) ssl_cert_free(s->session->cert);
-       s->session->cert=c;
+       if (s->session->sess_cert) ssl_sess_cert_free(s->session->sess_cert);
+       s->session->sess_cert=sc;
 
-       c->cert_chain=sk;
+       sc->cert_chain=sk;
        x=sk_X509_value(sk,0);
        sk=NULL;
 
@@ -791,14 +794,16 @@ static int ssl3_get_server_certificate(SSL *s)
                goto f_err;
                }
 
-       c->cert_type=i;
+       sc->peer_cert_type=i;
        CRYPTO_add(&x->references,1,CRYPTO_LOCK_X509);
-       if (c->pkeys[i].x509 != NULL)
-               X509_free(c->pkeys[i].x509);
-       c->pkeys[i].x509=x;
-       c->key= &(c->pkeys[i]);
-
-       if ((s->session != NULL) && (s->session->peer != NULL)) 
+       if (sc->peer_pkeys[i].x509 != NULL) /* Why would this ever happen?
+                                                                                * We just created sc a couple of
+                                                                                * lines ago. */
+               X509_free(sc->peer_pkeys[i].x509);
+       sc->peer_pkeys[i].x509=x;
+       sc->peer_key= &(sc->peer_pkeys[i]);
+
+       if (s->session->peer != NULL)
                X509_free(s->session->peer);
        CRYPTO_add(&x->references,1,CRYPTO_LOCK_X509);
        s->session->peer=x;
@@ -828,7 +833,9 @@ static int ssl3_get_key_exchange(SSL *s)
        int al,i,j,param_len,ok;
        long n,alg;
        EVP_PKEY *pkey=NULL;
+#ifndef NO_RSA
        RSA *rsa=NULL;
+#endif
 #ifndef NO_DH
        DH *dh=NULL;
 #endif
@@ -850,26 +857,26 @@ static int ssl3_get_key_exchange(SSL *s)
 
        param=p=(unsigned char *)s->init_buf->data;
 
-       if (s->session->cert != NULL)
+       if (s->session->sess_cert != NULL)
                {
 #ifndef NO_RSA
-               if (s->session->cert->rsa_tmp != NULL)
+               if (s->session->sess_cert->peer_rsa_tmp != NULL)
                        {
-                       RSA_free(s->session->cert->rsa_tmp);
-                       s->session->cert->rsa_tmp=NULL;
+                       RSA_free(s->session->sess_cert->peer_rsa_tmp);
+                       s->session->sess_cert->peer_rsa_tmp=NULL;
                        }
 #endif
 #ifndef NO_DH
-               if (s->session->cert->dh_tmp)
+               if (s->session->sess_cert->peer_dh_tmp)
                        {
-                       DH_free(s->session->cert->dh_tmp);
-                       s->session->cert->dh_tmp=NULL;
+                       DH_free(s->session->sess_cert->peer_dh_tmp);
+                       s->session->sess_cert->peer_dh_tmp=NULL;
                        }
 #endif
                }
        else
                {
-               s->session->cert=ssl_cert_new();
+               s->session->sess_cert=ssl_sess_cert_new();
                }
 
        param_len=0;
@@ -914,16 +921,16 @@ static int ssl3_get_key_exchange(SSL *s)
                p+=i;
                n-=param_len;
 
-/*             s->session->cert->rsa_tmp=rsa;*/
                /* this should be because we are using an export cipher */
                if (alg & SSL_aRSA)
-                       pkey=X509_get_pubkey(s->session->cert->pkeys[SSL_PKEY_RSA_ENC].x509);
+                       pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
                else
                        {
                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_INTERNAL_ERROR);
                        goto err;
                        }
-               s->session->cert->rsa_tmp=rsa;
+               s->session->sess_cert->peer_rsa_tmp=rsa;
+               rsa=NULL;
                }
        else
 #endif
@@ -983,16 +990,16 @@ static int ssl3_get_key_exchange(SSL *s)
 
 #ifndef NO_RSA
                if (alg & SSL_aRSA)
-                       pkey=X509_get_pubkey(s->session->cert->pkeys[SSL_PKEY_RSA_ENC].x509);
+                       pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
                else
 #endif
 #ifndef NO_DSA
                if (alg & SSL_aDSS)
-                       pkey=X509_get_pubkey(s->session->cert->pkeys[SSL_PKEY_DSA_SIGN].x509);
+                       pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_DSA_SIGN].x509);
 #endif
                /* else anonymous DH, so no certificate or pkey. */
 
-               s->session->cert->dh_tmp=dh;
+               s->session->sess_cert->peer_dh_tmp=dh;
                dh=NULL;
                }
        else if ((alg & SSL_kDHr) || (alg & SSL_kDHd))
@@ -1108,6 +1115,14 @@ f_err:
        ssl3_send_alert(s,SSL3_AL_FATAL,al);
 err:
        EVP_PKEY_free(pkey);
+#ifndef NO_RSA
+       if (rsa != NULL)
+               RSA_free(rsa);
+#endif
+#ifndef NO_DH
+       if (dh != NULL)
+               DH_free(dh);
+#endif
        return(-1);
        }
 
@@ -1287,10 +1302,13 @@ static int ssl3_get_server_done(SSL *s)
 
 static int ssl3_send_client_key_exchange(SSL *s)
        {
-       unsigned char *p,*q,*d;
+       unsigned char *p,*d;
        int n;
        unsigned long l;
+#ifndef NO_RSA
+       unsigned char *q;
        EVP_PKEY *pkey=NULL;
+#endif
 
        if (s->state == SSL3_ST_CW_KEY_EXCH_A)
                {
@@ -1305,11 +1323,11 @@ static int ssl3_send_client_key_exchange(SSL *s)
                        RSA *rsa;
                        unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
 
-                       if (s->session->cert->rsa_tmp != NULL)
-                               rsa=s->session->cert->rsa_tmp;
+                       if (s->session->sess_cert->peer_rsa_tmp != NULL)
+                               rsa=s->session->sess_cert->peer_rsa_tmp;
                        else
                                {
-                               pkey=X509_get_pubkey(s->session->cert->pkeys[SSL_PKEY_RSA_ENC].x509);
+                               pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
                                if ((pkey == NULL) ||
                                        (pkey->type != EVP_PKEY_RSA) ||
                                        (pkey->pkey.rsa == NULL))
@@ -1318,6 +1336,7 @@ static int ssl3_send_client_key_exchange(SSL *s)
                                        goto err;
                                        }
                                rsa=pkey->pkey.rsa;
+                               EVP_PKEY_free(pkey);
                                }
                                
                        tmp_buf[0]=s->client_version>>8;
@@ -1362,8 +1381,8 @@ static int ssl3_send_client_key_exchange(SSL *s)
                        {
                        DH *dh_srvr,*dh_clnt;
 
-                       if (s->session->cert->dh_tmp != NULL)
-                               dh_srvr=s->session->cert->dh_tmp;
+                       if (s->session->sess_cert->peer_dh_tmp != NULL)
+                               dh_srvr=s->session->sess_cert->peer_dh_tmp;
                        else
                                {
                                /* we get them from the cert */
@@ -1440,7 +1459,9 @@ static int ssl3_send_client_verify(SSL *s)
        unsigned char *p,*d;
        unsigned char data[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH];
        EVP_PKEY *pkey;
+#ifndef NO_RSA
        int i=0;
+#endif
        unsigned long n;
 #ifndef NO_DSA
        int j;
@@ -1589,13 +1610,17 @@ static int ssl3_check_cert_and_algorithm(SSL *s)
        int i,idx;
        long algs;
        EVP_PKEY *pkey=NULL;
-       CERT *c;
+       SESS_CERT *sc;
+#ifndef NO_RSA
        RSA *rsa;
+#endif
+#ifndef NO_DH
        DH *dh;
+#endif
 
-       c=s->session->cert;
+       sc=s->session->sess_cert;
 
-       if (c == NULL)
+       if (sc == NULL)
                {
                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_INTERNAL_ERROR);
                goto err;
@@ -1607,14 +1632,18 @@ static int ssl3_check_cert_and_algorithm(SSL *s)
        if (algs & (SSL_aDH|SSL_aNULL))
                return(1);
 
-       rsa=s->session->cert->rsa_tmp;
-       dh=s->session->cert->dh_tmp;
+#ifndef NO_RSA
+       rsa=s->session->sess_cert->peer_rsa_tmp;
+#endif
+#ifndef NO_DH
+       dh=s->session->sess_cert->peer_dh_tmp;
+#endif
 
        /* This is the passed certificate */
 
-       idx=c->cert_type;
-       pkey=X509_get_pubkey(c->pkeys[idx].x509);
-       i=X509_certificate_type(c->pkeys[idx].x509,pkey);
+       idx=sc->peer_cert_type;
+       pkey=X509_get_pubkey(sc->peer_pkeys[idx].x509);
+       i=X509_certificate_type(sc->peer_pkeys[idx].x509,pkey);
        EVP_PKEY_free(pkey);
 
        
@@ -1631,15 +1660,16 @@ static int ssl3_check_cert_and_algorithm(SSL *s)
                goto f_err;
                }
 #endif
-
+#ifndef NO_RSA
        if ((algs & SSL_kRSA) &&
                !(has_bits(i,EVP_PK_RSA|EVP_PKT_ENC) || (rsa != NULL)))
                {
                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_RSA_ENCRYPTING_CERT);
                goto f_err;
                }
+#endif
 #ifndef NO_DH
-       else if ((algs & SSL_kEDH) &&
+       if ((algs & SSL_kEDH) &&
                !(has_bits(i,EVP_PK_DH|EVP_PKT_EXCH) || (dh != NULL)))
                {
                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DH_KEY);