Commit d577a69a authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

remove unused references field 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 38186bfd

crypto/asn1/x_info.c

+0 −17
Original line number Diff line number Diff line
@@ -71,34 +71,17 @@ X509_INFO *X509_INFO_new(void) 
        return NULL;

    }



    ret->references = 1;



    ret->lock = CRYPTO_THREAD_lock_new();

    if (ret->lock == NULL) {

        X509_INFO_free(ret);

        return NULL;

    }



    return ret;

}



void X509_INFO_free(X509_INFO *x)

{

    int i;



    if (x == NULL)

        return;



    CRYPTO_atomic_add(&x->references, -1, &i, x->lock);

    REF_PRINT_COUNT("X509_INFO", x);

    if (i > 0)

        return;

    REF_ASSERT_ISNT(i < 0);



    X509_free(x->x509);

    X509_CRL_free(x->crl);

    X509_PKEY_free(x->x_pkey);

    OPENSSL_free(x->enc_data);

    CRYPTO_THREAD_lock_free(x->lock);

    OPENSSL_free(x);

}

crypto/asn1/x_pkey.c

+0 −15
Original line number Diff line number Diff line
@@ -69,12 +69,6 @@ X509_PKEY *X509_PKEY_new(void) 
    if (ret == NULL)

        goto err;



    ret->references = 1;

    ret->lock = CRYPTO_THREAD_lock_new();

    if (ret->lock == NULL) {

        OPENSSL_free(ret);

        return NULL;

    }

    ret->enc_algor = X509_ALGOR_new();

    ret->enc_pkey = ASN1_OCTET_STRING_new();

    if (ret->enc_algor == NULL || ret->enc_pkey == NULL)
@@ -89,22 +83,13 @@ err: 


void X509_PKEY_free(X509_PKEY *x)

{

    int i;



    if (x == NULL)

        return;



    CRYPTO_atomic_add(&x->references, -1, &i, x->lock);

    REF_PRINT_COUNT("X509_PKEY", x);

    if (i > 0)

        return;

    REF_ASSERT_ISNT(i < 0);



    X509_ALGOR_free(x->enc_algor);

    ASN1_OCTET_STRING_free(x->enc_pkey);

    EVP_PKEY_free(x->dec_pkey);

    if (x->key_free)

        OPENSSL_free(x->key_data);

    CRYPTO_THREAD_lock_free(x->lock);

    OPENSSL_free(x);

}

include/openssl/x509.h

+0 −4
Original line number Diff line number Diff line
@@ -292,8 +292,6 @@ typedef struct private_key_st { 
    int key_free;               /* true if we should auto free key_data */

    /* expanded version of 'enc_algor' */

    EVP_CIPHER_INFO cipher;

    int references;

    CRYPTO_RWLOCK *lock;

} X509_PKEY;



typedef struct X509_info_st {
@@ -303,8 +301,6 @@ typedef struct X509_info_st { 
    EVP_CIPHER_INFO enc_cipher;

    int enc_len;

    char *enc_data;

    int references;

    CRYPTO_RWLOCK *lock;

} X509_INFO;



DEFINE_STACK_OF(X509_INFO)