diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-08-12 16:18:55 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-08-28 18:09:59 +0100 |
| commit | cd2e17020e6ce6ba1d29d643bfaf1758302c8ca7 (patch) | |
| tree | 78591a3ebad9b74bbbc8b81e826a4d505bb23653 /ssl/s3_lib.c | |
| parent | 9346c75cb8bea75d3410be65f5b625289f375b2d (diff) | |
Remove serverinfo checks.
Since sanity checks are performed for all custom extensions the
serverinfo checks are no longer needed.
Reviewed-by: Emilia Käsper <emilia@openssl.org>
(cherry picked from commit 707b026d7871eb12c23671c975e6a15a8c331785)
Conflicts:
ssl/ssl3.h
ssl/t1_lib.c
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 1a1e3faac2..a15625b911 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3028,10 +3028,6 @@ void ssl3_free(SSL *s) #ifndef OPENSSL_NO_SRP SSL_SRP_CTX_free(s); #endif -#ifndef OPENSSL_NO_TLSEXT - if (s->s3->serverinfo_client_tlsext_custom_types != NULL) - OPENSSL_free(s->s3->serverinfo_client_tlsext_custom_types); -#endif OPENSSL_cleanse(s->s3,sizeof *s->s3); OPENSSL_free(s->s3); s->s3=NULL; @@ -3076,12 +3072,6 @@ void ssl3_clear(SSL *s) } #endif #ifndef OPENSSL_NO_TLSEXT - if (s->s3->serverinfo_client_tlsext_custom_types != NULL) - { - OPENSSL_free(s->s3->serverinfo_client_tlsext_custom_types); - s->s3->serverinfo_client_tlsext_custom_types = NULL; - } - s->s3->serverinfo_client_tlsext_custom_types_count = 0; #ifndef OPENSSL_NO_EC s->s3->is_probably_safari = 0; #endif /* !OPENSSL_NO_EC */ |