diff options
| author |   jsing <jsing@openbsd.org> | 2014-05-31 10:49:28 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-05-31 10:49:28 +0000 |
| commit | 1faa0e499708c894964780c27c8412b45faae6dd (patch) | |
| tree | ba68e1397bfa16390078f07ba332cf537b4e9c96 /lib/libssl/src/ssl/t1_lib.c | |
| parent | Delete the extraneous "return" statement at the end of a void function. (diff) | |
| download | wireguard-openbsd-1faa0e499708c894964780c27c8412b45faae6dd.tar.xz wireguard-openbsd-1faa0e499708c894964780c27c8412b45faae6dd.zip | |
TLS would not be entirely functional without extensions, so unifdef
OPENSSL_NO_TLSEXT.
ok tedu@
Diffstat (limited to 'lib/libssl/src/ssl/t1_lib.c')
| -rw-r--r-- | lib/libssl/src/ssl/t1_lib.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/libssl/src/ssl/t1_lib.c b/lib/libssl/src/ssl/t1_lib.c index 5ad69f5ce99..5d442558ddf 100644 --- a/lib/libssl/src/ssl/t1_lib.c +++ b/lib/libssl/src/ssl/t1_lib.c @@ -119,11 +119,9 @@ const char tls1_version_str[] = "TLSv1" OPENSSL_VERSION_PTEXT; -#ifndef OPENSSL_NO_TLSEXT static int tls_decrypt_ticket(SSL *s, const unsigned char *tick, int ticklen, const unsigned char *sess_id, int sesslen, SSL_SESSION **psess); -#endif SSL3_ENC_METHOD TLSv1_enc_data = { .enc = tls1_enc, @@ -200,9 +198,7 @@ tls1_new(SSL *s) void tls1_free(SSL *s) { -#ifndef OPENSSL_NO_TLSEXT free(s->tlsext_session_ticket); -#endif /* OPENSSL_NO_TLSEXT */ ssl3_free(s); } @@ -354,7 +350,6 @@ tls1_ec_nid2curve_id(int nid) } #endif /* OPENSSL_NO_EC */ -#ifndef OPENSSL_NO_TLSEXT /* List of supported signature algorithms and hashes. Should make this * customisable at some point, for now include everything we support. @@ -2315,4 +2310,3 @@ tls1_process_sigalgs(SSL *s, const unsigned char *data, int dsize) return 1; } -#endif |