summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl.h
diff options
context:
space:
mode:
authortb <>2018-08-24 20:30:21 +0000
committertb <>2018-08-24 20:30:21 +0000
commitf6faa42a2e718b5331e22139845d05acd06ceb7e (patch)
tree178f87a146a07d41a49712b685a292a7bd8a6362 /src/lib/libssl/ssl.h
parentacbbcd39d35326b275f28f6a108e12506a819b8e (diff)
downloadopenbsd-f6faa42a2e718b5331e22139845d05acd06ceb7e.tar.gz
openbsd-f6faa42a2e718b5331e22139845d05acd06ceb7e.tar.bz2
openbsd-f6faa42a2e718b5331e22139845d05acd06ceb7e.zip
Let SSL_copy_session_id() return an int for error checking.
Accordingly, add some error checking to SSL_copy_session_id(), BIO_ssl_copy_session_id(), and SSL_dup(). Prompted by OpenSSL commit 17dd65e6e1f Tested in a bulk build by sthen ok jsing
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r--src/lib/libssl/ssl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index c3b553fa2f..324691485b 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.158 2018/05/01 13:30:24 tb Exp $ */ 1/* $OpenBSD: ssl.h,v 1.159 2018/08/24 20:30:21 tb 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 *
@@ -1311,7 +1311,7 @@ long SSL_SESSION_get_time(const SSL_SESSION *s);
1311long SSL_SESSION_set_time(SSL_SESSION *s, long t); 1311long SSL_SESSION_set_time(SSL_SESSION *s, long t);
1312long SSL_SESSION_get_timeout(const SSL_SESSION *s); 1312long SSL_SESSION_get_timeout(const SSL_SESSION *s);
1313long SSL_SESSION_set_timeout(SSL_SESSION *s, long t); 1313long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
1314void SSL_copy_session_id(SSL *to, const SSL *from); 1314int SSL_copy_session_id(SSL *to, const SSL *from);
1315X509 *SSL_SESSION_get0_peer(SSL_SESSION *s); 1315X509 *SSL_SESSION_get0_peer(SSL_SESSION *s);
1316int SSL_SESSION_set1_id(SSL_SESSION *s, const unsigned char *sid, 1316int SSL_SESSION_set1_id(SSL_SESSION *s, const unsigned char *sid,
1317 unsigned int sid_len); 1317 unsigned int sid_len);