diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/Symbols.list | 1 | ||||
-rw-r--r-- | src/lib/libssl/ssl.h | 3 | ||||
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/libssl/Symbols.list b/src/lib/libssl/Symbols.list index c66024e21d..4508a362d1 100644 --- a/src/lib/libssl/Symbols.list +++ b/src/lib/libssl/Symbols.list | |||
@@ -244,6 +244,7 @@ SSL_rstate_string_long | |||
244 | SSL_select_next_proto | 244 | SSL_select_next_proto |
245 | SSL_set1_groups | 245 | SSL_set1_groups |
246 | SSL_set1_groups_list | 246 | SSL_set1_groups_list |
247 | SSL_set1_host | ||
247 | SSL_set1_param | 248 | SSL_set1_param |
248 | SSL_set_SSL_CTX | 249 | SSL_set_SSL_CTX |
249 | SSL_set_accept_state | 250 | SSL_set_accept_state |
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 4c8328fb80..ba5241850f 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.161 2018/11/07 01:53:36 jsing Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.162 2018/11/11 06:58:14 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 | * |
@@ -1385,6 +1385,7 @@ int SSL_CTX_set_purpose(SSL_CTX *s, int purpose); | |||
1385 | int SSL_set_purpose(SSL *s, int purpose); | 1385 | int SSL_set_purpose(SSL *s, int purpose); |
1386 | int SSL_CTX_set_trust(SSL_CTX *s, int trust); | 1386 | int SSL_CTX_set_trust(SSL_CTX *s, int trust); |
1387 | int SSL_set_trust(SSL *s, int trust); | 1387 | int SSL_set_trust(SSL *s, int trust); |
1388 | int SSL_set1_host(SSL *s, const char *hostname); | ||
1388 | 1389 | ||
1389 | X509_VERIFY_PARAM *SSL_CTX_get0_param(SSL_CTX *ctx); | 1390 | X509_VERIFY_PARAM *SSL_CTX_get0_param(SSL_CTX *ctx); |
1390 | int SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm); | 1391 | int SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm); |
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 31d411c429..66e14b9816 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.192 2018/11/10 01:19:09 beck Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.193 2018/11/11 06:58:14 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 | * |
@@ -453,6 +453,12 @@ SSL_set_trust(SSL *s, int trust) | |||
453 | return (X509_VERIFY_PARAM_set_trust(s->param, trust)); | 453 | return (X509_VERIFY_PARAM_set_trust(s->param, trust)); |
454 | } | 454 | } |
455 | 455 | ||
456 | int | ||
457 | SSL_set1_host(SSL *s, const char *hostname) | ||
458 | { | ||
459 | return X509_VERIFY_PARAM_set1_host(s->param, hostname, 0); | ||
460 | } | ||
461 | |||
456 | X509_VERIFY_PARAM * | 462 | X509_VERIFY_PARAM * |
457 | SSL_CTX_get0_param(SSL_CTX *ctx) | 463 | SSL_CTX_get0_param(SSL_CTX *ctx) |
458 | { | 464 | { |