diff options
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r-- | src/lib/libssl/ssl.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 4158d62cd8..46f24b2ea9 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.195 2021/06/30 18:04:05 jsing Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.196 2021/06/30 18:07:50 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 | * |
@@ -1039,6 +1039,7 @@ int PEM_write_SSL_SESSION(FILE *fp, SSL_SESSION *x); | |||
1039 | #define SSL_CTRL_SET_ECDH_AUTO 94 | 1039 | #define SSL_CTRL_SET_ECDH_AUTO 94 |
1040 | 1040 | ||
1041 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) | 1041 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) |
1042 | #define SSL_CTRL_GET_PEER_SIGNATURE_NID 108 | ||
1042 | #define SSL_CTRL_GET_PEER_TMP_KEY 109 | 1043 | #define SSL_CTRL_GET_PEER_TMP_KEY 109 |
1043 | #define SSL_CTRL_GET_SERVER_TMP_KEY SSL_CTRL_GET_PEER_TMP_KEY | 1044 | #define SSL_CTRL_GET_SERVER_TMP_KEY SSL_CTRL_GET_PEER_TMP_KEY |
1044 | #else | 1045 | #else |
@@ -1054,6 +1055,10 @@ int PEM_write_SSL_SESSION(FILE *fp, SSL_SESSION *x); | |||
1054 | #define SSL_CTRL_GET_MIN_PROTO_VERSION 130 | 1055 | #define SSL_CTRL_GET_MIN_PROTO_VERSION 130 |
1055 | #define SSL_CTRL_GET_MAX_PROTO_VERSION 131 | 1056 | #define SSL_CTRL_GET_MAX_PROTO_VERSION 131 |
1056 | 1057 | ||
1058 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) | ||
1059 | #define SSL_CTRL_GET_SIGNATURE_NID 132 | ||
1060 | #endif | ||
1061 | |||
1057 | #define DTLSv1_get_timeout(ssl, arg) \ | 1062 | #define DTLSv1_get_timeout(ssl, arg) \ |
1058 | SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)arg) | 1063 | SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)arg) |
1059 | #define DTLSv1_handle_timeout(ssl) \ | 1064 | #define DTLSv1_handle_timeout(ssl) \ |
@@ -1151,8 +1156,17 @@ const SSL_METHOD *SSL_CTX_get_ssl_method(const SSL_CTX *ctx); | |||
1151 | SSL_ctrl(s,SSL_CTRL_GET_SERVER_TMP_KEY,0,pk) | 1156 | SSL_ctrl(s,SSL_CTRL_GET_SERVER_TMP_KEY,0,pk) |
1152 | 1157 | ||
1153 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) | 1158 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) |
1159 | #define SSL_get_signature_nid(s, pn) \ | ||
1160 | SSL_ctrl(s, SSL_CTRL_GET_SIGNATURE_NID, 0, pn) | ||
1161 | |||
1162 | #define SSL_get_peer_signature_nid(s, pn) \ | ||
1163 | SSL_ctrl(s, SSL_CTRL_GET_PEER_SIGNATURE_NID, 0, pn) | ||
1154 | #define SSL_get_peer_tmp_key(s, pk) \ | 1164 | #define SSL_get_peer_tmp_key(s, pk) \ |
1155 | SSL_ctrl(s, SSL_CTRL_GET_PEER_TMP_KEY, 0, pk) | 1165 | SSL_ctrl(s, SSL_CTRL_GET_PEER_TMP_KEY, 0, pk) |
1166 | |||
1167 | int SSL_get_signature_type_nid(const SSL *ssl, int *nid); | ||
1168 | int SSL_get_peer_signature_type_nid(const SSL *ssl, int *nid); | ||
1169 | |||
1156 | #endif /* LIBRESSL_HAS_TLS1_3 || LIBRESSL_INTERNAL */ | 1170 | #endif /* LIBRESSL_HAS_TLS1_3 || LIBRESSL_INTERNAL */ |
1157 | 1171 | ||
1158 | #ifndef LIBRESSL_INTERNAL | 1172 | #ifndef LIBRESSL_INTERNAL |