diff options
| author | David Benjamin <davidben@chromium.org> | 2014-07-03 23:59:49 +0400 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-07-08 00:31:37 +0400 |
| commit | 6dbd73db5d58ec44304266012d23ff8d297eca55 (patch) | |
| tree | 3efae2919223544d7cf1f92834d2edc8a4e90a86 /ssl/ssl_sess.c | |
| parent | 31955f91dcdb1a30bc7fd560ee9054321fc514e9 (diff) | |
Remove OPENSSL_NO_TLSEXT compilation option.
Mostly done with unifdef.
Change-Id: I876f79f9e96d77628d696b09694363d07aee6b74
Reviewed-on: https://boringssl-review.googlesource.com/1096
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'ssl/ssl_sess.c')
| -rw-r--r-- | ssl/ssl_sess.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 0153ba77..35f9eb6e 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -213,7 +213,6 @@ SSL_SESSION *SSL_SESSION_new(void) ss->time=(unsigned long)time(NULL); ss->prev=NULL; ss->next=NULL; -#ifndef OPENSSL_NO_TLSEXT ss->tlsext_hostname = NULL; #ifndef OPENSSL_NO_EC ss->tlsext_ecpointformatlist_length = 0; @@ -221,7 +220,6 @@ SSL_SESSION *SSL_SESSION_new(void) ss->tlsext_ellipticcurvelist_length = 0; ss->tlsext_ellipticcurvelist = NULL; #endif -#endif CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_SESSION, ss, &ss->ex_data); #ifndef OPENSSL_NO_PSK ss->psk_identity_hint=NULL; @@ -340,14 +338,12 @@ int ssl_get_new_session(SSL *s, int session) SSL_SESSION_free(ss); return(0); } -#ifndef OPENSSL_NO_TLSEXT /* If RFC4507 ticket use empty session ID */ if (s->tlsext_ticket_expected) { ss->session_id_length = 0; goto sess_id_done; } -#endif /* Choose which callback will set the session ID */ CRYPTO_r_lock(CRYPTO_LOCK_SSL_CTX); if(s->generate_session_id) @@ -386,7 +382,6 @@ int ssl_get_new_session(SSL *s, int session) SSL_SESSION_free(ss); return(0); } -#ifndef OPENSSL_NO_TLSEXT sess_id_done: if (s->tlsext_hostname) { ss->tlsext_hostname = BUF_strdup(s->tlsext_hostname); @@ -396,7 +391,6 @@ int ssl_get_new_session(SSL *s, int session) return 0; } } -#endif #ifndef OPENSSL_NO_PSK if (s->psk_identity_hint) { @@ -453,9 +447,7 @@ int ssl_get_prev_session(SSL *s, const struct ssl_early_callback_ctx *ctx) SSL_SESSION *ret=NULL; int fatal = 0; int try_session_cache = 1; -#ifndef OPENSSL_NO_TLSEXT int r; -#endif if (ctx->session_id_len > SSL_MAX_SSL_SESSION_ID_LENGTH) goto err; @@ -463,7 +455,6 @@ int ssl_get_prev_session(SSL *s, const struct ssl_early_callback_ctx *ctx) if (ctx->session_id_len == 0) try_session_cache = 0; -#ifndef OPENSSL_NO_TLSEXT r = tls1_process_ticket(s, ctx, &ret); /* sets s->tlsext_ticket_expected */ switch (r) { @@ -480,7 +471,6 @@ int ssl_get_prev_session(SSL *s, const struct ssl_early_callback_ctx *ctx) default: abort(); } -#endif if (try_session_cache && ret == NULL && @@ -607,14 +597,12 @@ int ssl_get_prev_session(SSL *s, const struct ssl_early_callback_ctx *ctx) if (ret != NULL) { SSL_SESSION_free(ret); -#ifndef OPENSSL_NO_TLSEXT if (!try_session_cache) { /* The session was from a ticket, so we should * issue a ticket for the new session */ s->tlsext_ticket_expected = 1; } -#endif } if (fatal) return -1; @@ -752,7 +740,6 @@ void SSL_SESSION_free(SSL_SESSION *ss) if (ss->sess_cert != NULL) ssl_sess_cert_free(ss->sess_cert); if (ss->peer != NULL) X509_free(ss->peer); if (ss->ciphers != NULL) sk_SSL_CIPHER_free(ss->ciphers); -#ifndef OPENSSL_NO_TLSEXT if (ss->tlsext_hostname != NULL) OPENSSL_free(ss->tlsext_hostname); if (ss->tlsext_tick != NULL) OPENSSL_free(ss->tlsext_tick); #ifndef OPENSSL_NO_EC @@ -761,7 +748,6 @@ 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 */ -#endif #ifndef OPENSSL_NO_PSK if (ss->psk_identity_hint != NULL) OPENSSL_free(ss->psk_identity_hint); @@ -882,7 +868,6 @@ long SSL_CTX_get_timeout(const SSL_CTX *s) return(s->session_timeout); } -#ifndef OPENSSL_NO_TLSEXT int SSL_set_session_secret_cb(SSL *s, int (*tls_session_secret_cb)(SSL *s, void *secret, int *secret_len, STACK_OF(SSL_CIPHER) *peer_ciphers, SSL_CIPHER **cipher, void *arg), void *arg) { @@ -935,7 +920,6 @@ int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len) return 0; } -#endif /* OPENSSL_NO_TLSEXT */ typedef struct timeout_param_st { |