diff options
| author | Matt Caswell <matt@openssl.org> | 2018-03-26 19:12:25 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-03-27 17:15:24 +0100 |
| commit | 320a81277e402f393289ae7229b2320324321fb1 (patch) | |
| tree | 342b0eb948fccb52621e97cce7b69b09c701ca05 /ssl | |
| parent | 9d5db9c9ab9b9f2f2a5ce9795405e8334cd2ce66 (diff) | |
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 <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5757)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_lib.c | 2 | ||||
| -rw-r--r-- | ssl/ssl_cert.c | 3 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 3 | ||||
| -rw-r--r-- | ssl/ssl_sess.c | 3 |
4 files changed, 1 insertions, 10 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 619326949c..78a5a3a2e2 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 6078f9f459..5a465e3942 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 b66cd71d90..b678fcfbbb 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 7d94b57220..1672cd2a95 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) |