diff options
| author | David Benjamin <davidben@chromium.org> | 2014-07-15 07:43:37 +0400 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-07-25 01:11:05 +0400 |
| commit | ff175b4a46c86cf4fba6200abfe799a778786ada (patch) | |
| tree | d8d1d519b27d792d02ead4fec6920cfdc4091008 /ssl/ssl_sess.c | |
| parent | 019c3cc64a6f8d76dcee044c6d0d9133424ac1cd (diff) | |
unifdef OPENSSL_NO_PSK.
Get those out of the way.
Change-Id: I4cc8c34cf637379ad734c43623f76ae72f22014e
Reviewed-on: https://boringssl-review.googlesource.com/1282
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'ssl/ssl_sess.c')
| -rw-r--r-- | ssl/ssl_sess.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 97ef3f89..ffc0d153 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -221,10 +221,8 @@ SSL_SESSION *SSL_SESSION_new(void) ss->tlsext_ellipticcurvelist = NULL; #endif CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_SESSION, ss, &ss->ex_data); -#ifndef OPENSSL_NO_PSK ss->psk_identity_hint=NULL; ss->psk_identity=NULL; -#endif return(ss); } @@ -391,7 +389,6 @@ int ssl_get_new_session(SSL *s, int session) return 0; } } -#ifndef OPENSSL_NO_PSK if (s->psk_identity_hint) { ss->psk_identity_hint = BUF_strdup(s->psk_identity_hint); @@ -402,7 +399,6 @@ int ssl_get_new_session(SSL *s, int session) return 0; } } -#endif } else { @@ -741,12 +737,10 @@ void SSL_SESSION_free(SSL_SESSION *ss) ss->tlsext_ellipticcurvelist_length = 0; if (ss->tlsext_ellipticcurvelist != NULL) OPENSSL_free(ss->tlsext_ellipticcurvelist); #endif /* OPENSSL_NO_EC */ -#ifndef OPENSSL_NO_PSK if (ss->psk_identity_hint != NULL) OPENSSL_free(ss->psk_identity_hint); if (ss->psk_identity != NULL) OPENSSL_free(ss->psk_identity); -#endif OPENSSL_cleanse(ss,sizeof(*ss)); OPENSSL_free(ss); } |