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

diff --git a/lib/libcrypto/hidden/openssl/ui.h b/lib/libcrypto/hidden/openssl/ui.h
index 7ad9ca0..812714a 100644 (file)
--- a/lib/libcrypto/hidden/openssl/ui.h
+++ b/lib/libcrypto/hidden/openssl/ui.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ui.h,v 1.1 2022/11/12 13:16:10 beck Exp $ */
+/* $OpenBSD: ui.h,v 1.2 2022/12/17 21:59:39 tb Exp $ */
 /*
  * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
  *
@@ -48,6 +48,7 @@ LCRYPTO_USED(UI_get_default_method);
 LCRYPTO_USED(UI_get_method);
 LCRYPTO_USED(UI_set_method);
 LCRYPTO_USED(UI_OpenSSL);
+LCRYPTO_USED(UI_null);
 LCRYPTO_USED(UI_create_method);
 LCRYPTO_USED(UI_destroy_method);
 LCRYPTO_USED(UI_method_set_opener);

diff --git a/lib/libcrypto/ui/ui.h b/lib/libcrypto/ui/ui.h
index 7755cf4..ee27fd2 100644 (file)
--- a/lib/libcrypto/ui/ui.h
+++ b/lib/libcrypto/ui/ui.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ui.h,v 1.14 2022/07/12 18:43:56 jsing Exp $ */
+/* $OpenBSD: ui.h,v 1.15 2022/12/17 21:59:39 tb Exp $ */
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2001.
  */
@@ -257,6 +257,9 @@ const UI_METHOD *UI_set_method(UI *ui, const UI_METHOD *meth);
 /* The method with all the built-in thingies */
 UI_METHOD *UI_OpenSSL(void);
 
+#if defined(LIBRESSL_INTERNAL) || defined(LIBRESSL_NEXT_API)
+const UI_METHOD *UI_null(void);
+#endif
 
 /*
  * ---------- For method writers ----------

diff --git a/lib/libcrypto/ui/ui_null.c b/lib/libcrypto/ui/ui_null.c
new file mode 100644 (file)
index 0000000..7bb7a90
--- /dev/null
+++ b/lib/libcrypto/ui/ui_null.c
@@ -0,0 +1,18 @@
+/*     $OpenBSD: ui_null.c,v 1.1 2022/12/17 21:59:39 tb Exp $ */
+
+/*
+ * Written by Theo Buehler. Public domain.
+ */
+
+#include "ui_local.h"
+
+static const UI_METHOD ui_null = {
+       .name = "OpenSSL NULL UI",
+};
+
+const UI_METHOD *
+UI_null(void)
+{
+       return &ui_null;
+}
+LCRYPTO_ALIAS(UI_null)