summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2021-01-26 18:43:41 +0000
committertb <>2021-01-26 18:43:41 +0000
commit3e18624e953b3e767a43a5915cdebcbcc1d48c7a (patch)
treec9a75013d698104a4ac45eceae4675668f8bff02 /src
parentc1474fe27acff975d8a3948fb3b6b72d099ee9ce (diff)
downloadopenbsd-3e18624e953b3e767a43a5915cdebcbcc1d48c7a.tar.gz
openbsd-3e18624e953b3e767a43a5915cdebcbcc1d48c7a.tar.bz2
openbsd-3e18624e953b3e767a43a5915cdebcbcc1d48c7a.zip
Prepare to provide SSL_set_hostflags()
Yet another one of these X509_VERIFY_PARAM reacharounds into libcrypto. Recently found in imapfilter, also used elsewhere. Will be made publicly visible with the next minor bump. ok jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/ssl.h3
-rw-r--r--src/lib/libssl/ssl_lib.c8
2 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index a6ac6a1825..425ba50c14 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.179 2020/10/14 16:49:57 jsing Exp $ */ 1/* $OpenBSD: ssl.h,v 1.180 2021/01/26 18:43:41 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 *
@@ -1444,6 +1444,7 @@ int SSL_CTX_set_trust(SSL_CTX *s, int trust);
1444int SSL_set_trust(SSL *s, int trust); 1444int SSL_set_trust(SSL *s, int trust);
1445int SSL_set1_host(SSL *s, const char *hostname); 1445int SSL_set1_host(SSL *s, const char *hostname);
1446#if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) 1446#if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL)
1447void SSL_set_hostflags(SSL *s, unsigned int flags);
1447const char *SSL_get0_peername(SSL *s); 1448const char *SSL_get0_peername(SSL *s);
1448#endif 1449#endif
1449 1450
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index e0e0ae4ff1..3a69adbc27 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.241 2021/01/26 14:22:19 jsing Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.242 2021/01/26 18:43:41 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 *
@@ -469,6 +469,12 @@ SSL_set1_host(SSL *s, const char *hostname)
469 return X509_VERIFY_PARAM_set1_host(s->param, hostname, 0); 469 return X509_VERIFY_PARAM_set1_host(s->param, hostname, 0);
470} 470}
471 471
472void
473SSL_set_hostflags(SSL *s, unsigned int flags)
474{
475 X509_VERIFY_PARAM_set_hostflags(s->param, flags);
476}
477
472const char * 478const char *
473SSL_get0_peername(SSL *s) 479SSL_get0_peername(SSL *s)
474{ 480{