Skip to content

Commit 320a812

Browse files
mattcaswellmattcaswell
committed
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 e03ddfa). 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 <[email protected]> (Merged from #5757)
1 parent 9d5db9c commit 320a812

15 files changed

+1
-42
lines changed

‎crypto/bio/bss_acpt.c

-3
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,6 @@ static BIO_ACCEPT *BIO_ACCEPT_new(void)
101101

102102
static void BIO_ACCEPT_free(BIO_ACCEPT *a)
103103
{
104-
if (a == NULL)
105-
return;
106-
107104
OPENSSL_free(a->param_addr);
108105
OPENSSL_free(a->param_serv);
109106
BIO_ADDRINFO_free(a->addr_first);

‎crypto/bio/bss_conn.c

-3
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,6 @@ BIO_CONNECT *BIO_CONNECT_new(void)
232232

233233
void BIO_CONNECT_free(BIO_CONNECT *a)
234234
{
235-
if (a == NULL)
236-
return;
237-
238235
OPENSSL_free(a->param_hostname);
239236
OPENSSL_free(a->param_service);
240237
BIO_ADDRINFO_free(a->addr_first);

‎crypto/bn/bn_blind.c

-3
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ BN_BLINDING *BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, BIGNUM *mod)
8080

8181
void BN_BLINDING_free(BN_BLINDING *r)
8282
{
83-
if (r == NULL)
84-
return;
85-
8683
BN_free(r->A);
8784
BN_free(r->Ai);
8885
BN_free(r->e);

‎crypto/bn/bn_ctx.c

-2
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,6 @@ BN_CTX *BN_CTX_secure_new(void)
156156

157157
void BN_CTX_free(BN_CTX *ctx)
158158
{
159-
if (ctx == NULL)
160-
return;
161159
#ifdef BN_CTX_DEBUG
162160
{
163161
BN_POOL_ITEM *pool = ctx->pool.head;

‎crypto/bn/bn_mont.c

-3
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,6 @@ void BN_MONT_CTX_init(BN_MONT_CTX *ctx)
217217

218218
void BN_MONT_CTX_free(BN_MONT_CTX *mont)
219219
{
220-
if (mont == NULL)
221-
return;
222-
223220
BN_clear_free(&(mont->RR));
224221
BN_clear_free(&(mont->N));
225222
BN_clear_free(&(mont->Ni));

‎crypto/bn/bn_recp.c

-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ BN_RECP_CTX *BN_RECP_CTX_new(void)
3232

3333
void BN_RECP_CTX_free(BN_RECP_CTX *recp)
3434
{
35-
if (recp == NULL)
36-
return;
37-
3835
BN_free(&(recp->N));
3936
BN_free(&(recp->Nr));
4037
if (recp->flags & BN_FLG_MALLOCED)

‎crypto/buffer/buffer.c

-3
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ BUF_MEM *BUF_MEM_new(void)
4242

4343
void BUF_MEM_free(BUF_MEM *a)
4444
{
45-
if (a == NULL)
46-
return;
47-
4845
if (a->data != NULL) {
4946
if (a->flags & BUF_MEM_FLAG_SECURE)
5047
OPENSSL_secure_clear_free(a->data, a->max);

‎crypto/comp/comp_lib.c

-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ const char *COMP_get_name(const COMP_METHOD *meth)
4545

4646
void COMP_CTX_free(COMP_CTX *ctx)
4747
{
48-
if (ctx == NULL)
49-
return;
50-
5148
if (ctx->meth->finish != NULL)
5249
ctx->meth->finish(ctx);
5350

‎crypto/err/err.c

-3
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,6 @@ static void ERR_STATE_free(ERR_STATE *s)
256256
{
257257
int i;
258258

259-
if (s == NULL)
260-
return;
261-
262259
for (i = 0; i < ERR_NUM_ERRORS; i++) {
263260
err_clear_data(s, i);
264261
}

‎crypto/txt_db/txt_db.c

-3
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,6 @@ void TXT_DB_free(TXT_DB *db)
284284
int i, n;
285285
char **p, *max;
286286

287-
if (db == NULL)
288-
return;
289-
290287
if (db->index != NULL) {
291288
for (i = db->num_fields - 1; i >= 0; i--)
292289
lh_OPENSSL_STRING_free(db->index[i]);

‎crypto/x509/x509_lu.c

-3
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,6 @@ void X509_STORE_free(X509_STORE *vfy)
178178
STACK_OF(X509_LOOKUP) *sk;
179179
X509_LOOKUP *lu;
180180

181-
if (vfy == NULL)
182-
return;
183-
184181
CRYPTO_DOWN_REF(&vfy->references, &i, vfy->lock);
185182
REF_PRINT_COUNT("X509_STORE", vfy);
186183
if (i > 0)

‎ssl/s3_lib.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3312,7 +3312,7 @@ int ssl3_new(SSL *s)
33123312

33133313
void ssl3_free(SSL *s)
33143314
{
3315-
if (s == NULL || s->s3 == NULL)
3315+
if (s->s3 == NULL)
33163316
return;
33173317

33183318
ssl3_cleanup_key_block(s);

‎ssl/ssl_cert.c

-3
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,6 @@ void ssl_cert_free(CERT *c)
225225
{
226226
int i;
227227

228-
if (c == NULL)
229-
return;
230-
231228
CRYPTO_DOWN_REF(&c->references, &i, c->lock);
232229
REF_PRINT_COUNT("CERT", c);
233230
if (i > 0)

‎ssl/ssl_lib.c

-3
Original file line numberDiff line numberDiff line change
@@ -1125,9 +1125,6 @@ void SSL_free(SSL *s)
11251125
{
11261126
int i;
11271127

1128-
if (s == NULL)
1129-
return;
1130-
11311128
CRYPTO_DOWN_REF(&s->references, &i, s->lock);
11321129
REF_PRINT_COUNT("SSL", s);
11331130
if (i > 0)

‎ssl/ssl_sess.c

-3
Original file line numberDiff line numberDiff line change
@@ -785,9 +785,6 @@ void SSL_SESSION_free(SSL_SESSION *ss)
785785
{
786786
int i;
787787

788-
if (ss == NULL)
789-
return;
790-
791788
CRYPTO_DOWN_REF(&ss->references, &i, ss->lock);
792789
REF_PRINT_COUNT("SSL_SESSION", ss);
793790
if (i > 0)

0 commit comments

Comments
 (0)