summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r--src/lib/libssl/ssl.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index eb288699b1..a783739c57 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.172 2020/09/13 16:49:05 jsing Exp $ */ 1/* $OpenBSD: ssl.h,v 1.173 2020/09/17 15:42:14 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 *
@@ -1126,7 +1126,12 @@ int PEM_write_SSL_SESSION(FILE *fp, SSL_SESSION *x);
1126 1126
1127#define SSL_CTRL_SET_ECDH_AUTO 94 1127#define SSL_CTRL_SET_ECDH_AUTO 94
1128 1128
1129#if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL)
1130#define SSL_CTRL_GET_PEER_TMP_KEY 109
1131#define SSL_CTRL_GET_SERVER_TMP_KEY SSL_CTRL_GET_PEER_TMP_KEY
1132#else
1129#define SSL_CTRL_GET_SERVER_TMP_KEY 109 1133#define SSL_CTRL_GET_SERVER_TMP_KEY 109
1134#endif
1130 1135
1131#define SSL_CTRL_GET_CHAIN_CERTS 115 1136#define SSL_CTRL_GET_CHAIN_CERTS 115
1132 1137
@@ -1231,6 +1236,11 @@ int SSL_set_max_proto_version(SSL *ssl, uint16_t version);
1231#define SSL_get_server_tmp_key(s, pk) \ 1236#define SSL_get_server_tmp_key(s, pk) \
1232 SSL_ctrl(s,SSL_CTRL_GET_SERVER_TMP_KEY,0,pk) 1237 SSL_ctrl(s,SSL_CTRL_GET_SERVER_TMP_KEY,0,pk)
1233 1238
1239#if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL)
1240#define SSL_get_peer_tmp_key(s, pk) \
1241 SSL_ctrl(s, SSL_CTRL_GET_PEER_TMP_KEY, 0, pk)
1242#endif /* LIBRESSL_HAS_TLS1_3 || LIBRESSL_INTERNAL */
1243
1234#ifndef LIBRESSL_INTERNAL 1244#ifndef LIBRESSL_INTERNAL
1235/* 1245/*
1236 * Also provide those functions as macros for compatibility with 1246 * Also provide those functions as macros for compatibility with