summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/ssl.h11
-rw-r--r--src/lib/libssl/ssl_lib.c25
2 files changed, 34 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 401c9cf843..b01c426c9c 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.174 2020/09/19 09:56:34 tb Exp $ */ 1/* $OpenBSD: ssl.h,v 1.175 2020/09/19 10:05:00 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 *
@@ -1458,6 +1458,15 @@ int SSL_is_server(const SSL *s);
1458int SSL_read(SSL *ssl, void *buf, int num); 1458int SSL_read(SSL *ssl, void *buf, int num);
1459int SSL_peek(SSL *ssl, void *buf, int num); 1459int SSL_peek(SSL *ssl, void *buf, int num);
1460int SSL_write(SSL *ssl, const void *buf, int num); 1460int SSL_write(SSL *ssl, const void *buf, int num);
1461
1462#if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL)
1463uint32_t SSL_CTX_get_max_early_data(const SSL_CTX *ctx);
1464int SSL_CTX_set_max_early_data(SSL_CTX *ctx, uint32_t max_early_data);
1465
1466uint32_t SSL_get_max_early_data(const SSL *s);
1467int SSL_set_max_early_data(SSL *s, uint32_t max_early_data);
1468#endif
1469
1461long SSL_ctrl(SSL *ssl, int cmd, long larg, void *parg); 1470long SSL_ctrl(SSL *ssl, int cmd, long larg, void *parg);
1462long SSL_callback_ctrl(SSL *, int, void (*)(void)); 1471long SSL_callback_ctrl(SSL *, int, void (*)(void));
1463long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg); 1472long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index c184f75abe..3c62f39a57 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_lib.c,v 1.230 2020/09/18 16:18:56 schwarze Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.231 2020/09/19 10:05:00 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 *
@@ -1000,6 +1000,29 @@ SSL_write(SSL *s, const void *buf, int num)
1000 return ssl3_write(s, buf, num); 1000 return ssl3_write(s, buf, num);
1001} 1001}
1002 1002
1003uint32_t
1004SSL_CTX_get_max_early_data(const SSL_CTX *ctx)
1005{
1006 return 0;
1007}
1008
1009int
1010SSL_CTX_set_max_early_data(SSL_CTX *ctx, uint32_t max_early_data)
1011{
1012 return 1;
1013}
1014
1015uint32_t
1016SSL_get_max_early_data(const SSL *s)
1017{
1018 return 0;
1019}
1020
1021int
1022SSL_set_max_early_data(SSL *s, uint32_t max_early_data)
1023{
1024 return 1;
1025}
1003int 1026int
1004SSL_shutdown(SSL *s) 1027SSL_shutdown(SSL *s)
1005{ 1028{