Accept NULL in *_free.

[openssl.git] / ssl / ssl_lib.c

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index f562ec6b14d49ddd5ee3b85544483993d79f8004..9e578fd738be8ff5d21a026fb44de3a93cf12d09 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -61,7 +61,7 @@
 #include "lhash.h"
 #include "ssl_locl.h"
 
 #include "lhash.h"
 #include "ssl_locl.h"
 

-char *SSL_version_str="SSLeay 0.9.0b 29-Jun-1998";
+char *SSL_version_str="OpenSSL 0.9.2 31-Dec-1998";

 
 static STACK *ssl_meth=NULL;
 static STACK *ssl_ctx_meth=NULL;
 
 static STACK *ssl_meth=NULL;
 static STACK *ssl_ctx_meth=NULL;


@@ -203,6 +203,9 @@ SSL *s;
        {
        int i;
 
        {
        int i;
 

+       if(s == NULL)
+           return;
+

        i=CRYPTO_add(&s->references,-1,CRYPTO_LOCK_SSL);
 #ifdef REF_PRINT
        REF_PRINT("SSL",s);
        i=CRYPTO_add(&s->references,-1,CRYPTO_LOCK_SSL);
 #ifdef REF_PRINT
        REF_PRINT("SSL",s);


@@ -248,6 +251,11 @@ SSL *s;
 
        ssl_clear_cipher_ctx(s);
 
 
        ssl_clear_cipher_ctx(s);
 

+       if (s->expand != NULL)
+               COMP_CTX_free(s->expand);
+       if (s->compress != NULL)
+               COMP_CTX_free(s->compress);
+

        if (s->cert != NULL) ssl_cert_free(s->cert);
        /* Free up if allocated */
 
        if (s->cert != NULL) ssl_cert_free(s->cert);
        /* Free up if allocated */
 


@@ -839,8 +847,11 @@ SSL_SESSION *a;
        {
        unsigned long l;
 
        {
        unsigned long l;
 

-       l=      (a->session_id[0]     )|(a->session_id[1]<< 8L)|
-               (a->session_id[2]<<16L)|(a->session_id[3]<<24L);
+       l=(unsigned long)
+               ((unsigned int) a->session_id[0]     )|
+               ((unsigned int) a->session_id[1]<< 8L)|
+               ((unsigned long)a->session_id[2]<<16L)|
+               ((unsigned long)a->session_id[3]<<24L);

        return(l);
        }
 
        return(l);
        }
 


@@ -858,13 +869,19 @@ SSL_SESSION *b;
 SSL_CTX *SSL_CTX_new(meth)
 SSL_METHOD *meth;
        {
 SSL_CTX *SSL_CTX_new(meth)
 SSL_METHOD *meth;
        {

-       SSL_CTX *ret;
+       SSL_CTX *ret=NULL;

        
        if (meth == NULL)
                {
                SSLerr(SSL_F_SSL_CTX_NEW,SSL_R_NULL_SSL_METHOD_PASSED);
                return(NULL);
                }
        
        if (meth == NULL)
                {
                SSLerr(SSL_F_SSL_CTX_NEW,SSL_R_NULL_SSL_METHOD_PASSED);
                return(NULL);
                }

+
+       if (SSL_get_ex_data_X509_STORE_CTX_idx() < 0)
+               {
+               SSLerr(SSL_F_SSL_CTX_NEW,SSL_R_X509_VERIFICATION_SETUP_PROBLEMS);
+               goto err;
+               }

        ret=(SSL_CTX *)Malloc(sizeof(SSL_CTX));
        if (ret == NULL)
                goto err;
        ret=(SSL_CTX *)Malloc(sizeof(SSL_CTX));
        if (ret == NULL)
                goto err;


@@ -956,6 +973,8 @@ SSL_METHOD *meth;
 
        CRYPTO_new_ex_data(ssl_ctx_meth,(char *)ret,&ret->ex_data);
 
 
        CRYPTO_new_ex_data(ssl_ctx_meth,(char *)ret,&ret->ex_data);
 

+       ret->extra_certs=NULL;
+

        return(ret);
 err:
        SSLerr(SSL_F_SSL_CTX_NEW,ERR_R_MALLOC_FAILURE);
        return(ret);
 err:
        SSLerr(SSL_F_SSL_CTX_NEW,ERR_R_MALLOC_FAILURE);


@@ -1000,6 +1019,8 @@ SSL_CTX *a;
                ssl_cert_free(a->default_cert);
        if (a->client_CA != NULL)
                sk_pop_free(a->client_CA,X509_NAME_free);
                ssl_cert_free(a->default_cert);
        if (a->client_CA != NULL)
                sk_pop_free(a->client_CA,X509_NAME_free);

+       if (a->extra_certs != NULL)
+               sk_pop_free(a->extra_certs,X509_free);

        Free((char *)a);
        }
 
        Free((char *)a);
        }
 


@@ -1341,7 +1362,9 @@ SSL *s;
                SSLerr(SSL_F_SSL_DO_HANDSHAKE,SSL_R_CONNECTION_TYPE_NOT_SET);
                return(-1);
                }
                SSLerr(SSL_F_SSL_DO_HANDSHAKE,SSL_R_CONNECTION_TYPE_NOT_SET);
                return(-1);
                }

-       if (s->s3->renegotiate) ssl3_renegotiate_check(s);
+
+       s->method->ssl_renegotiate_check(s);
+

        if (SSL_in_init(s) || SSL_in_before(s))
                {
                ret=s->handshake_func(s);
        if (SSL_in_init(s) || SSL_in_before(s))
                {
                ret=s->handshake_func(s);


@@ -1615,6 +1638,7 @@ SSL *ssl;
        return(ssl->ctx);
        }
 
        return(ssl->ctx);
        }
 

+#ifndef NO_STDIO

 int SSL_CTX_set_default_verify_paths(ctx)
 SSL_CTX *ctx;
        {
 int SSL_CTX_set_default_verify_paths(ctx)
 SSL_CTX *ctx;
        {


@@ -1628,6 +1652,7 @@ char *CApath;
        {
        return(X509_STORE_load_locations(ctx->cert_store,CAfile,CApath));
        }
        {
        return(X509_STORE_load_locations(ctx->cert_store,CAfile,CApath));
        }

+#endif

 
 void SSL_set_info_callback(ssl,cb)
 SSL *ssl;
 
 void SSL_set_info_callback(ssl,cb)
 SSL *ssl;


@@ -1639,7 +1664,7 @@ void (*cb)();
 void (*SSL_get_info_callback(ssl))()
 SSL *ssl;
        {
 void (*SSL_get_info_callback(ssl))()
 SSL *ssl;
        {

-       return(ssl->info_callback);
+       return((void (*)())ssl->info_callback);

        }
 
 int SSL_state(ssl)
        }
 
 int SSL_state(ssl)


@@ -1715,6 +1740,18 @@ int idx;
        return(CRYPTO_get_ex_data(&s->ex_data,idx));
        }
 
        return(CRYPTO_get_ex_data(&s->ex_data,idx));
        }
 

+int ssl_ok(s)
+SSL *s;
+       {
+       return(1);
+       }
+
+void SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx,RSA *(*cb)(SSL *ssl,int export))
+    { SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_RSA_CB,0,(char *)cb); }
+
+void SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx,DH *(*dh)(SSL *ssl,int export))
+    { SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_DH_CB,0,(char *)dh); }
+

 #if defined(_WINDLL) && defined(WIN16)
 #include "../crypto/bio/bss_file.c"
 #endif
 #if defined(_WINDLL) && defined(WIN16)
 #include "../crypto/bio/bss_file.c"
 #endif