From fdc4606feb94779934028693ff7c29f8e754299c Mon Sep 17 00:00:00 2001
From: jsing <jsing@openbsd.org>
Date: Fri, 23 Dec 2022 02:20:28 +0000
Subject: [PATCH] Remove compatibility "glue" for des_read_pw{_string}()

Nothing can be actually using these as the symbols are not exported from
libcrypto... hopefully ui_compat.h can also go away entirely.

ok tb@
---
 lib/libcrypto/ui/ui_compat.h | 20 +-------------------
 lib/libcrypto/ui/ui_util.c   | 17 +----------------
 2 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/lib/libcrypto/ui/ui_compat.h b/lib/libcrypto/ui/ui_compat.h
index 860e80c83c5..6484bf6b5e5 100644
--- a/lib/libcrypto/ui/ui_compat.h
+++ b/lib/libcrypto/ui/ui_compat.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ui_compat.h,v 1.4 2014/06/12 15:49:31 deraadt Exp $ */
+/* $OpenBSD: ui_compat.h,v 1.5 2022/12/23 02:20:28 jsing Exp $ */
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
  * project 2001.
  */
@@ -62,22 +62,4 @@
 #include <openssl/opensslconf.h>
 #include <openssl/ui.h>
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* The following functions were previously part of the DES section,
-   and are provided here for backward compatibility reasons. */
-
-#define des_read_pw_string(b,l,p,v) \
-	_ossl_old_des_read_pw_string((b),(l),(p),(v))
-#define des_read_pw(b,bf,s,p,v) \
-	_ossl_old_des_read_pw((b),(bf),(s),(p),(v))
-
-int _ossl_old_des_read_pw_string(char *buf, int length, const char *prompt, int verify);
-int _ossl_old_des_read_pw(char *buf, char *buff, int size, const char *prompt, int verify);
-
-#ifdef  __cplusplus
-}
-#endif
 #endif
diff --git a/lib/libcrypto/ui/ui_util.c b/lib/libcrypto/ui/ui_util.c
index 347e4118bcc..5e7048531cc 100644
--- a/lib/libcrypto/ui/ui_util.c
+++ b/lib/libcrypto/ui/ui_util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ui_util.c,v 1.12 2022/11/26 16:08:54 tb Exp $ */
+/* $OpenBSD: ui_util.c,v 1.13 2022/12/23 02:20:28 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 2001-2002 The OpenSSL Project.  All rights reserved.
  *
@@ -96,18 +96,3 @@ UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt, int verify)
 	return (ok);
 }
 LCRYPTO_ALIAS(UI_UTIL_read_pw)
-
-/*
- * Old compatibility glue - see comment in ui_compat.h.
- */
-int
-_ossl_old_des_read_pw_string(char *buf, int length, const char *prompt, int verify)
-{
-	return UI_UTIL_read_pw_string(buf, length, prompt, verify);
-}
-
-int
-_ossl_old_des_read_pw(char *buf, char *buff, int size, const char *prompt, int verify)
-{
-	return UI_UTIL_read_pw(buf, buff, size, prompt, verify);
-}
-- 
2.20.1