With the changed des_old API, let's complete the work by renaming the

functions in ui_compat.  This gave reason to rework that part more
thoroughly, so here are the changes made:

1. Add DES_read_password() and DES_read_2passwords() with the same
   functionality as the corresponding old des_ functions, as a
   convenience to the users.
2. Add UI_UTIL_read_pw_string() and UI_UTIL_read_pw() with the
   functionality from des_read_pw_string() and des_read_pw(), again as
   a concenience to the users.
3. Rename des_read_password(), des_read_2passwords(),
   des_read_pw_string() and des_read_pw() by changing des_ to
   _ossl_old_des_, and add the usual mapping macros.
4. Move the implementation of des_read_password() and
   des_read_2passwords() to the des directory, since they are tightly
   tied to DES anyway.

This change was inspired by a patch from Assar Westerlund <assar@sics.se>:

There are some functions that didn't get the kick-away-old-des-and-
replace-des-with-DES action.  Here's a patch that adds DES_ and des_
(in des_old.h) versions of des_read_pw_string et al.  This patch
includes some of the first des_old.h semi-colon macro fixes that I've
already sent.

1 files changed, 10 insertions, 0 deletions

diff --git a/crypto/des/des_old.c b/crypto/des/des_old.c
index 4219662..e6cc1ce 100644
--- a/crypto/des/des_old.c
+++ b/crypto/des/des_old.c
@@ -223,6 +223,16 @@ void _ossl_old_des_random_key(des_cblock ret)
 	{
 	DES_random_key((DES_cblock *)ret);
 	}
+int _ossl_old_des_read_password(des_cblock *key, const char *prompt,
+				int verify)
+	{
+	return DES_read_password(key, prompt, verify);
+	}
+int _ossl_old_des_read_2passwords(des_cblock *key1, des_cblock *key2,
+	const char *prompt, int verify)
+	{
+	return DES_read_2passwords(key1, key2, prompt, verify);
+	}
 void _ossl_old_des_set_odd_parity(des_cblock *key)
 	{
 	DES_set_odd_parity(key);