summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2022-12-17 21:59:39 +0000
committertb <>2022-12-17 21:59:39 +0000
commit0c1260402b1ede3903c721dcd86f96d56a8292fb (patch)
tree94d7cca4021be3e74c90760cd4b981f22107456f /src
parent3badb2f37b0b6599d1adea20cfe176f262924ddc (diff)
downloadopenbsd-0c1260402b1ede3903c721dcd86f96d56a8292fb.tar.gz
openbsd-0c1260402b1ede3903c721dcd86f96d56a8292fb.tar.bz2
openbsd-0c1260402b1ede3903c721dcd86f96d56a8292fb.zip
Prepare to provide UI_null()
xmlsec needs this, nothing else. Our linkers link libxmlsec1-openssl, only warns and since nothing uses this library in ports, this wasn't noticed for a long time. Reported by Thomas Mitterfellner ok jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/hidden/openssl/ui.h3
-rw-r--r--src/lib/libcrypto/ui/ui.h5
-rw-r--r--src/lib/libcrypto/ui/ui_null.c18
3 files changed, 24 insertions, 2 deletions
diff --git a/src/lib/libcrypto/hidden/openssl/ui.h b/src/lib/libcrypto/hidden/openssl/ui.h
index 7ad9ca0285..812714aa98 100644
--- a/src/lib/libcrypto/hidden/openssl/ui.h
+++ b/src/lib/libcrypto/hidden/openssl/ui.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ui.h,v 1.1 2022/11/12 13:16:10 beck Exp $ */ 1/* $OpenBSD: ui.h,v 1.2 2022/12/17 21:59:39 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2022 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -48,6 +48,7 @@ LCRYPTO_USED(UI_get_default_method);
48LCRYPTO_USED(UI_get_method); 48LCRYPTO_USED(UI_get_method);
49LCRYPTO_USED(UI_set_method); 49LCRYPTO_USED(UI_set_method);
50LCRYPTO_USED(UI_OpenSSL); 50LCRYPTO_USED(UI_OpenSSL);
51LCRYPTO_USED(UI_null);
51LCRYPTO_USED(UI_create_method); 52LCRYPTO_USED(UI_create_method);
52LCRYPTO_USED(UI_destroy_method); 53LCRYPTO_USED(UI_destroy_method);
53LCRYPTO_USED(UI_method_set_opener); 54LCRYPTO_USED(UI_method_set_opener);
diff --git a/src/lib/libcrypto/ui/ui.h b/src/lib/libcrypto/ui/ui.h
index 7755cf4a3a..ee27fd2a49 100644
--- a/src/lib/libcrypto/ui/ui.h
+++ b/src/lib/libcrypto/ui/ui.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ui.h,v 1.14 2022/07/12 18:43:56 jsing Exp $ */ 1/* $OpenBSD: ui.h,v 1.15 2022/12/17 21:59:39 tb Exp $ */
2/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL 2/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
3 * project 2001. 3 * project 2001.
4 */ 4 */
@@ -257,6 +257,9 @@ const UI_METHOD *UI_set_method(UI *ui, const UI_METHOD *meth);
257/* The method with all the built-in thingies */ 257/* The method with all the built-in thingies */
258UI_METHOD *UI_OpenSSL(void); 258UI_METHOD *UI_OpenSSL(void);
259 259
260#if defined(LIBRESSL_INTERNAL) || defined(LIBRESSL_NEXT_API)
261const UI_METHOD *UI_null(void);
262#endif
260 263
261/* 264/*
262 * ---------- For method writers ---------- 265 * ---------- For method writers ----------
diff --git a/src/lib/libcrypto/ui/ui_null.c b/src/lib/libcrypto/ui/ui_null.c
new file mode 100644
index 0000000000..7bb7a90b2f
--- /dev/null
+++ b/src/lib/libcrypto/ui/ui_null.c
@@ -0,0 +1,18 @@
1/* $OpenBSD: ui_null.c,v 1.1 2022/12/17 21:59:39 tb Exp $ */
2
3/*
4 * Written by Theo Buehler. Public domain.
5 */
6
7#include "ui_local.h"
8
9static const UI_METHOD ui_null = {
10 .name = "OpenSSL NULL UI",
11};
12
13const UI_METHOD *
14UI_null(void)
15{
16 return &ui_null;
17}
18LCRYPTO_ALIAS(UI_null)