sync with OpenBSD -current

This commit is contained in:
purplerain 2024-02-05 01:13:44 +00:00
parent 3f3212838f
commit 36c45cb00b
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
26 changed files with 324 additions and 349 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: ssl_lib.c,v 1.319 2024/02/03 15:58:34 beck Exp $ */
/* $OpenBSD: ssl_lib.c,v 1.320 2024/02/04 20:50:23 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -1068,7 +1068,7 @@ SSL_is_server(const SSL *s)
LSSL_ALIAS(SSL_is_server);
static long
ssl_get_default_timeout()
ssl_get_default_timeout(void)
{
/*
* 2 hours, the 24 hours mentioned in the TLSv1 spec