Commit 2c382349 authored by Kurt Roeckx's avatar Kurt Roeckx
Browse files

Remove ssl_cert_inst() 



It created the cert structure in SSL_CTX or SSL if it was NULL, but they can
never be NULL as the comments already said.

Reviewed-by: default avatarDr. Stephen Henson <steve@openssl.org>
parent 9fbbdd73

ssl/s3_lib.c

+0 −32
Original line number Diff line number Diff line
@@ -3252,22 +3252,6 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) 
{

    int ret = 0;



#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_RSA)

    if (

# ifndef OPENSSL_NO_RSA

           cmd == SSL_CTRL_SET_TMP_RSA || cmd == SSL_CTRL_SET_TMP_RSA_CB ||

# endif

# ifndef OPENSSL_NO_DSA

           cmd == SSL_CTRL_SET_TMP_DH || cmd == SSL_CTRL_SET_TMP_DH_CB ||

# endif

           0) {

        if (!ssl_cert_inst(&s->cert)) {

            SSLerr(SSL_F_SSL3_CTRL, ERR_R_MALLOC_FAILURE);

            return (0);

        }

    }

#endif



    switch (cmd) {

    case SSL_CTRL_GET_SESSION_REUSED:

        ret = s->hit;
@@ -3705,22 +3689,6 @@ long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp) (void)) 
{

    int ret = 0;



#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_RSA)

    if (

# ifndef OPENSSL_NO_RSA

           cmd == SSL_CTRL_SET_TMP_RSA_CB ||

# endif

# ifndef OPENSSL_NO_DSA

           cmd == SSL_CTRL_SET_TMP_DH_CB ||

# endif

           0) {

        if (!ssl_cert_inst(&s->cert)) {

            SSLerr(SSL_F_SSL3_CALLBACK_CTRL, ERR_R_MALLOC_FAILURE);

            return (0);

        }

    }

#endif



    switch (cmd) {

#ifndef OPENSSL_NO_RSA

    case SSL_CTRL_SET_TMP_RSA_CB:

ssl/ssl_cert.c

+0 −25
Original line number Diff line number Diff line
@@ -484,31 +484,6 @@ void ssl_cert_free(CERT *c) 
    OPENSSL_free(c);

}



int ssl_cert_inst(CERT **o)

{

    /*

     * Create a CERT if there isn't already one (which cannot really happen,

     * as it is initially created in SSL_CTX_new; but the earlier code

     * usually allows for that one being non-existant, so we follow that

     * behaviour, as it might turn out that there actually is a reason for it

     * -- but I'm not sure that *all* of the existing code could cope with

     * s->cert being NULL, otherwise we could do without the initialization

     * in SSL_CTX_new).

     */



    if (o == NULL) {

        SSLerr(SSL_F_SSL_CERT_INST, ERR_R_PASSED_NULL_PARAMETER);

        return (0);

    }

    if (*o == NULL) {

        if ((*o = ssl_cert_new()) == NULL) {

            SSLerr(SSL_F_SSL_CERT_INST, ERR_R_MALLOC_FAILURE);

            return (0);

        }

    }

    return (1);

}



int ssl_cert_set0_chain(SSL *s, SSL_CTX *ctx, STACK_OF(X509) *chain)

{

    int i, r;

ssl/ssl_err.c

+0 −1
Original line number Diff line number Diff line
@@ -202,7 +202,6 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
    {ERR_FUNC(SSL_F_SSL_BYTES_TO_CIPHER_LIST), "ssl_bytes_to_cipher_list"},

    {ERR_FUNC(SSL_F_SSL_CERT_ADD0_CHAIN_CERT), "ssl_cert_add0_chain_cert"},

    {ERR_FUNC(SSL_F_SSL_CERT_DUP), "ssl_cert_dup"},

    {ERR_FUNC(SSL_F_SSL_CERT_INST), "ssl_cert_inst"},

    {ERR_FUNC(SSL_F_SSL_CERT_INSTANTIATE), "SSL_CERT_INSTANTIATE"},

    {ERR_FUNC(SSL_F_SSL_CERT_NEW), "ssl_cert_new"},

    {ERR_FUNC(SSL_F_SSL_CERT_SET0_CHAIN), "ssl_cert_set0_chain"},

ssl/ssl_lib.c

+12 −16
Original line number Diff line number Diff line
@@ -288,7 +288,6 @@ SSL *SSL_new(SSL_CTX *ctx) 
    s->mode = ctx->mode;

    s->max_cert_list = ctx->max_cert_list;



    if (ctx->cert != NULL) {

    /*

     * Earlier library versions used to copy the pointer to the CERT, not

     * its contents; only when setting new parameters for the per-SSL
@@ -298,12 +297,9 @@ SSL *SSL_new(SSL_CTX *ctx) 
     * used to be known as s->ctx->default_cert). Now we don't look at the

     * SSL_CTX's CERT after having duplicated it once.

     */



    s->cert = ssl_cert_dup(ctx->cert);

    if (s->cert == NULL)

        goto err;

    } else

        s->cert = NULL;         /* Cannot really happen (see SSL_CTX_new) */



    s->read_ahead = ctx->read_ahead;

    s->msg_callback = ctx->msg_callback;

ssl/ssl_locl.h

+0 −1
Original line number Diff line number Diff line
@@ -2053,7 +2053,6 @@ int ssl_clear_bad_session(SSL *s); 
CERT *ssl_cert_new(void);

CERT *ssl_cert_dup(CERT *cert);

void ssl_cert_set_default_md(CERT *cert);

int ssl_cert_inst(CERT **o);

void ssl_cert_clear_certs(CERT *c);

void ssl_cert_free(CERT *c);

SESS_CERT *ssl_sess_cert_new(void);