From: Matt Caswell Date: Mon, 26 Mar 2018 18:12:25 +0000 (+0100) Subject: Remove some code for a contributor that we cannot find X-Git-Tag: OpenSSL_1_1_1-pre4~47 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=320a81277e402f393289ae7229b2320324321fb1;p=thirdparty%2Fopenssl.git Remove some code for a contributor that we cannot find This removes some code because we cannot trace the original contributor to get their agreement for the licence change (original commit e03ddfae). After this change there will be numerous failures in the test cases until someone rewrites the missing code. All *_free functions should accept a NULL parameter. After this change the following *_free functions will fail if a NULL parameter is passed: BIO_ACCEPT_free() BIO_CONNECT_free() BN_BLINDING_free() BN_CTX_free() BN_MONT_CTX_free() BN_RECP_CTX_free() BUF_MEM_free() COMP_CTX_free() ERR_STATE_free() TXT_DB_free() X509_STORE_free() ssl3_free() ssl_cert_free() SSL_SESSION_free() SSL_free() [skip ci] Reviewed-by: Bernd Edlinger (Merged from https://github.com/openssl/openssl/pull/5757) --- diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c index b7ec0c0d4a7..0171c496076 100644 --- a/crypto/bio/bss_acpt.c +++ b/crypto/bio/bss_acpt.c @@ -101,9 +101,6 @@ static BIO_ACCEPT *BIO_ACCEPT_new(void) static void BIO_ACCEPT_free(BIO_ACCEPT *a) { - if (a == NULL) - return; - OPENSSL_free(a->param_addr); OPENSSL_free(a->param_serv); BIO_ADDRINFO_free(a->addr_first); diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c index 5c461ae7519..0fad02fdd59 100644 --- a/crypto/bio/bss_conn.c +++ b/crypto/bio/bss_conn.c @@ -232,9 +232,6 @@ BIO_CONNECT *BIO_CONNECT_new(void) void BIO_CONNECT_free(BIO_CONNECT *a) { - if (a == NULL) - return; - OPENSSL_free(a->param_hostname); OPENSSL_free(a->param_service); BIO_ADDRINFO_free(a->addr_first); diff --git a/crypto/bn/bn_blind.c b/crypto/bn/bn_blind.c index 006ad6e597f..8bd61567e7d 100644 --- a/crypto/bn/bn_blind.c +++ b/crypto/bn/bn_blind.c @@ -80,9 +80,6 @@ BN_BLINDING *BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, BIGNUM *mod) void BN_BLINDING_free(BN_BLINDING *r) { - if (r == NULL) - return; - BN_free(r->A); BN_free(r->Ai); BN_free(r->e); diff --git a/crypto/bn/bn_ctx.c b/crypto/bn/bn_ctx.c index 68c04687437..7202aef326d 100644 --- a/crypto/bn/bn_ctx.c +++ b/crypto/bn/bn_ctx.c @@ -156,8 +156,6 @@ BN_CTX *BN_CTX_secure_new(void) void BN_CTX_free(BN_CTX *ctx) { - if (ctx == NULL) - return; #ifdef BN_CTX_DEBUG { BN_POOL_ITEM *pool = ctx->pool.head; diff --git a/crypto/bn/bn_mont.c b/crypto/bn/bn_mont.c index 6357c60c771..bae7d235bd1 100644 --- a/crypto/bn/bn_mont.c +++ b/crypto/bn/bn_mont.c @@ -217,9 +217,6 @@ void BN_MONT_CTX_init(BN_MONT_CTX *ctx) void BN_MONT_CTX_free(BN_MONT_CTX *mont) { - if (mont == NULL) - return; - BN_clear_free(&(mont->RR)); BN_clear_free(&(mont->N)); BN_clear_free(&(mont->Ni)); diff --git a/crypto/bn/bn_recp.c b/crypto/bn/bn_recp.c index e873699163c..923a9b33d8f 100644 --- a/crypto/bn/bn_recp.c +++ b/crypto/bn/bn_recp.c @@ -32,9 +32,6 @@ BN_RECP_CTX *BN_RECP_CTX_new(void) void BN_RECP_CTX_free(BN_RECP_CTX *recp) { - if (recp == NULL) - return; - BN_free(&(recp->N)); BN_free(&(recp->Nr)); if (recp->flags & BN_FLG_MALLOCED) diff --git a/crypto/buffer/buffer.c b/crypto/buffer/buffer.c index cbd2e531135..dfa5c23d1d2 100644 --- a/crypto/buffer/buffer.c +++ b/crypto/buffer/buffer.c @@ -42,9 +42,6 @@ BUF_MEM *BUF_MEM_new(void) void BUF_MEM_free(BUF_MEM *a) { - if (a == NULL) - return; - if (a->data != NULL) { if (a->flags & BUF_MEM_FLAG_SECURE) OPENSSL_secure_clear_free(a->data, a->max); diff --git a/crypto/comp/comp_lib.c b/crypto/comp/comp_lib.c index 137a5db7a2b..5bed1876a80 100644 --- a/crypto/comp/comp_lib.c +++ b/crypto/comp/comp_lib.c @@ -45,9 +45,6 @@ const char *COMP_get_name(const COMP_METHOD *meth) void COMP_CTX_free(COMP_CTX *ctx) { - if (ctx == NULL) - return; - if (ctx->meth->finish != NULL) ctx->meth->finish(ctx); diff --git a/crypto/err/err.c b/crypto/err/err.c index c0a6b2b16fa..4ae61786864 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -256,9 +256,6 @@ static void ERR_STATE_free(ERR_STATE *s) { int i; - if (s == NULL) - return; - for (i = 0; i < ERR_NUM_ERRORS; i++) { err_clear_data(s, i); } diff --git a/crypto/txt_db/txt_db.c b/crypto/txt_db/txt_db.c index d6859629f6a..a08f346af67 100644 --- a/crypto/txt_db/txt_db.c +++ b/crypto/txt_db/txt_db.c @@ -284,9 +284,6 @@ void TXT_DB_free(TXT_DB *db) int i, n; char **p, *max; - if (db == NULL) - return; - if (db->index != NULL) { for (i = db->num_fields - 1; i >= 0; i--) lh_OPENSSL_STRING_free(db->index[i]); diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c index b8845f1e64f..d69cedb72f8 100644 --- a/crypto/x509/x509_lu.c +++ b/crypto/x509/x509_lu.c @@ -178,9 +178,6 @@ void X509_STORE_free(X509_STORE *vfy) STACK_OF(X509_LOOKUP) *sk; X509_LOOKUP *lu; - if (vfy == NULL) - return; - CRYPTO_DOWN_REF(&vfy->references, &i, vfy->lock); REF_PRINT_COUNT("X509_STORE", vfy); if (i > 0) diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 619326949c4..78a5a3a2e23 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3312,7 +3312,7 @@ int ssl3_new(SSL *s) void ssl3_free(SSL *s) { - if (s == NULL || s->s3 == NULL) + if (s->s3 == NULL) return; ssl3_cleanup_key_block(s); diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 6078f9f459e..5a465e39425 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -225,9 +225,6 @@ void ssl_cert_free(CERT *c) { int i; - if (c == NULL) - return; - CRYPTO_DOWN_REF(&c->references, &i, c->lock); REF_PRINT_COUNT("CERT", c); if (i > 0) diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index b66cd71d900..b678fcfbbb3 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1125,9 +1125,6 @@ void SSL_free(SSL *s) { int i; - if (s == NULL) - return; - CRYPTO_DOWN_REF(&s->references, &i, s->lock); REF_PRINT_COUNT("SSL", s); if (i > 0) diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 7d94b572206..1672cd2a954 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -785,9 +785,6 @@ void SSL_SESSION_free(SSL_SESSION *ss) { int i; - if (ss == NULL) - return; - CRYPTO_DOWN_REF(&ss->references, &i, ss->lock); REF_PRINT_COUNT("SSL_SESSION", ss); if (i > 0)