diff options
author | jsing <> | 2020-07-07 19:31:11 +0000 |
---|---|---|
committer | jsing <> | 2020-07-07 19:31:11 +0000 |
commit | fbb23402e63e54d6d2231406a88302014f0c6ca6 (patch) | |
tree | 1085279d989b13f602e3533c7b4f7b4447017733 /src/lib/libssl/t1_lib.c | |
parent | a61f9f14c0b9e8d1dff514c4937c7c2167ebb243 (diff) | |
download | openbsd-fbb23402e63e54d6d2231406a88302014f0c6ca6.tar.gz openbsd-fbb23402e63e54d6d2231406a88302014f0c6ca6.tar.bz2 openbsd-fbb23402e63e54d6d2231406a88302014f0c6ca6.zip |
Remove some unnecessary function pointers from SSL_METHOD_INTERNAL.
ssl_version is completely unused and get_timeout is the same everywhere.
ok beck@ inoguchi@ tb@
Diffstat (limited to 'src/lib/libssl/t1_lib.c')
-rw-r--r-- | src/lib/libssl/t1_lib.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index 580ae4b19b..6a2b082d02 100644 --- a/src/lib/libssl/t1_lib.c +++ b/src/lib/libssl/t1_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: t1_lib.c,v 1.167 2020/05/29 17:39:42 jsing Exp $ */ | 1 | /* $OpenBSD: t1_lib.c,v 1.168 2020/07/07 19:31:11 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -138,14 +138,6 @@ SSL3_ENC_METHOD TLSv1_2_enc_data = { | |||
138 | SSL_ENC_FLAG_SHA256_PRF|SSL_ENC_FLAG_TLS1_2_CIPHERS, | 138 | SSL_ENC_FLAG_SHA256_PRF|SSL_ENC_FLAG_TLS1_2_CIPHERS, |
139 | }; | 139 | }; |
140 | 140 | ||
141 | long | ||
142 | tls1_default_timeout(void) | ||
143 | { | ||
144 | /* 2 hours, the 24 hours mentioned in the TLSv1 spec | ||
145 | * is way too long for http, the cache would over fill */ | ||
146 | return (60 * 60 * 2); | ||
147 | } | ||
148 | |||
149 | int | 141 | int |
150 | tls1_new(SSL *s) | 142 | tls1_new(SSL *s) |
151 | { | 143 | { |