diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/Symbols.list | 6 | ||||
| -rw-r--r-- | src/lib/libssl/ssl.h | 5 | ||||
| -rw-r--r-- | src/lib/libssl/ssl_lib.c | 14 |
3 files changed, 20 insertions, 5 deletions
diff --git a/src/lib/libssl/Symbols.list b/src/lib/libssl/Symbols.list index e147ff873d..c91dff9e58 100644 --- a/src/lib/libssl/Symbols.list +++ b/src/lib/libssl/Symbols.list | |||
| @@ -56,6 +56,7 @@ SSL_CTX_check_private_key | |||
| 56 | SSL_CTX_ctrl | 56 | SSL_CTX_ctrl |
| 57 | SSL_CTX_flush_sessions | 57 | SSL_CTX_flush_sessions |
| 58 | SSL_CTX_free | 58 | SSL_CTX_free |
| 59 | SSL_CTX_get0_param | ||
| 59 | SSL_CTX_get_cert_store | 60 | SSL_CTX_get_cert_store |
| 60 | SSL_CTX_get_client_CA_list | 61 | SSL_CTX_get_client_CA_list |
| 61 | SSL_CTX_get_client_cert_cb | 62 | SSL_CTX_get_client_cert_cb |
| @@ -97,8 +98,8 @@ SSL_CTX_set_default_verify_paths | |||
| 97 | SSL_CTX_set_ex_data | 98 | SSL_CTX_set_ex_data |
| 98 | SSL_CTX_set_generate_session_id | 99 | SSL_CTX_set_generate_session_id |
| 99 | SSL_CTX_set_info_callback | 100 | SSL_CTX_set_info_callback |
| 100 | SSL_CTX_set_min_proto_version | ||
| 101 | SSL_CTX_set_max_proto_version | 101 | SSL_CTX_set_max_proto_version |
| 102 | SSL_CTX_set_min_proto_version | ||
| 102 | SSL_CTX_set_msg_callback | 103 | SSL_CTX_set_msg_callback |
| 103 | SSL_CTX_set_next_proto_select_cb | 104 | SSL_CTX_set_next_proto_select_cb |
| 104 | SSL_CTX_set_next_protos_advertised_cb | 105 | SSL_CTX_set_next_protos_advertised_cb |
| @@ -162,6 +163,7 @@ SSL_export_keying_material | |||
| 162 | SSL_free | 163 | SSL_free |
| 163 | SSL_get0_alpn_selected | 164 | SSL_get0_alpn_selected |
| 164 | SSL_get0_next_proto_negotiated | 165 | SSL_get0_next_proto_negotiated |
| 166 | SSL_get0_param | ||
| 165 | SSL_get1_session | 167 | SSL_get1_session |
| 166 | SSL_get_SSL_CTX | 168 | SSL_get_SSL_CTX |
| 167 | SSL_get_certificate | 169 | SSL_get_certificate |
| @@ -231,8 +233,8 @@ SSL_set_ex_data | |||
| 231 | SSL_set_fd | 233 | SSL_set_fd |
| 232 | SSL_set_generate_session_id | 234 | SSL_set_generate_session_id |
| 233 | SSL_set_info_callback | 235 | SSL_set_info_callback |
| 234 | SSL_set_min_proto_version | ||
| 235 | SSL_set_max_proto_version | 236 | SSL_set_max_proto_version |
| 237 | SSL_set_min_proto_version | ||
| 236 | SSL_set_msg_callback | 238 | SSL_set_msg_callback |
| 237 | SSL_set_purpose | 239 | SSL_set_purpose |
| 238 | SSL_set_quiet_shutdown | 240 | SSL_set_quiet_shutdown |
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index d431b175ad..7768f0a80f 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl.h,v 1.134 2017/08/30 16:24:21 jsing Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.135 2018/02/14 16:16:10 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 | * |
| @@ -1336,10 +1336,11 @@ int SSL_set_purpose(SSL *s, int purpose); | |||
| 1336 | int SSL_CTX_set_trust(SSL_CTX *s, int trust); | 1336 | int SSL_CTX_set_trust(SSL_CTX *s, int trust); |
| 1337 | int SSL_set_trust(SSL *s, int trust); | 1337 | int SSL_set_trust(SSL *s, int trust); |
| 1338 | 1338 | ||
| 1339 | X509_VERIFY_PARAM *SSL_CTX_get0_param(SSL_CTX *ctx); | ||
| 1339 | int SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm); | 1340 | int SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm); |
| 1341 | X509_VERIFY_PARAM *SSL_get0_param(SSL *ssl); | ||
| 1340 | int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm); | 1342 | int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm); |
| 1341 | 1343 | ||
| 1342 | |||
| 1343 | void SSL_free(SSL *ssl); | 1344 | void SSL_free(SSL *ssl); |
| 1344 | int SSL_accept(SSL *ssl); | 1345 | int SSL_accept(SSL *ssl); |
| 1345 | int SSL_connect(SSL *ssl); | 1346 | int SSL_connect(SSL *ssl); |
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index c7ae2a9631..9e3ef90729 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.172 2017/10/11 17:35:00 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.173 2018/02/14 16:16:10 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 | * |
| @@ -469,12 +469,24 @@ SSL_set_trust(SSL *s, int trust) | |||
| 469 | return (X509_VERIFY_PARAM_set_trust(s->param, trust)); | 469 | return (X509_VERIFY_PARAM_set_trust(s->param, trust)); |
| 470 | } | 470 | } |
| 471 | 471 | ||
| 472 | X509_VERIFY_PARAM * | ||
| 473 | SSL_CTX_get0_param(SSL_CTX *ctx) | ||
| 474 | { | ||
| 475 | return (ctx->param); | ||
| 476 | } | ||
| 477 | |||
| 472 | int | 478 | int |
| 473 | SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm) | 479 | SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm) |
| 474 | { | 480 | { |
| 475 | return (X509_VERIFY_PARAM_set1(ctx->param, vpm)); | 481 | return (X509_VERIFY_PARAM_set1(ctx->param, vpm)); |
| 476 | } | 482 | } |
| 477 | 483 | ||
| 484 | X509_VERIFY_PARAM * | ||
| 485 | SSL_get0_param(SSL *ssl) | ||
| 486 | { | ||
| 487 | return (ssl->param); | ||
| 488 | } | ||
| 489 | |||
| 478 | int | 490 | int |
| 479 | SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm) | 491 | SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm) |
| 480 | { | 492 | { |
