summaryrefslogtreecommitdiff
path: root/src/lib/libssl/t1_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/t1_lib.c')
-rw-r--r--src/lib/libssl/t1_lib.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
index 5ad69f5ce9..5d442558dd 100644
--- a/src/lib/libssl/t1_lib.c
+++ b/src/lib/libssl/t1_lib.c
@@ -119,11 +119,9 @@
119 119
120const char tls1_version_str[] = "TLSv1" OPENSSL_VERSION_PTEXT; 120const char tls1_version_str[] = "TLSv1" OPENSSL_VERSION_PTEXT;
121 121
122#ifndef OPENSSL_NO_TLSEXT
123static int tls_decrypt_ticket(SSL *s, const unsigned char *tick, int ticklen, 122static int tls_decrypt_ticket(SSL *s, const unsigned char *tick, int ticklen,
124 const unsigned char *sess_id, int sesslen, 123 const unsigned char *sess_id, int sesslen,
125 SSL_SESSION **psess); 124 SSL_SESSION **psess);
126#endif
127 125
128SSL3_ENC_METHOD TLSv1_enc_data = { 126SSL3_ENC_METHOD TLSv1_enc_data = {
129 .enc = tls1_enc, 127 .enc = tls1_enc,
@@ -200,9 +198,7 @@ tls1_new(SSL *s)
200void 198void
201tls1_free(SSL *s) 199tls1_free(SSL *s)
202{ 200{
203#ifndef OPENSSL_NO_TLSEXT
204 free(s->tlsext_session_ticket); 201 free(s->tlsext_session_ticket);
205#endif /* OPENSSL_NO_TLSEXT */
206 ssl3_free(s); 202 ssl3_free(s);
207} 203}
208 204
@@ -354,7 +350,6 @@ tls1_ec_nid2curve_id(int nid)
354} 350}
355#endif /* OPENSSL_NO_EC */ 351#endif /* OPENSSL_NO_EC */
356 352
357#ifndef OPENSSL_NO_TLSEXT
358 353
359/* List of supported signature algorithms and hashes. Should make this 354/* List of supported signature algorithms and hashes. Should make this
360 * customisable at some point, for now include everything we support. 355 * 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)
2315 return 1; 2310 return 1;
2316} 2311}
2317 2312
2318#endif