diff options
author | Richard Levitte <levitte@openssl.org> | 2002-02-05 17:15:18 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2002-02-05 17:15:18 +0000 |
commit | 44bdb056d4c7c72494d5d4b702bbad5cc869df03 (patch) | |
tree | 32c25f15312a2d734c4ead50e2a8497b79f60d14 /crypto/des/des.h | |
parent | c31bbf1e68b7e677a3de0b60e361a041d8771dd6 (diff) |
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.
Diffstat (limited to 'crypto/des/des.h')
-rw-r--r-- | crypto/des/des.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/des/des.h b/crypto/des/des.h index 237113129d..6e4cdbd904 100644 --- a/crypto/des/des.h +++ b/crypto/des/des.h @@ -221,6 +221,10 @@ void DES_cfb64_encrypt(const unsigned char *in,unsigned char *out,long length, void DES_ofb64_encrypt(const unsigned char *in,unsigned char *out,long length, DES_key_schedule *schedule,DES_cblock *ivec,int *num); +int DES_read_password(DES_cblock *key, const char *prompt, int verify); +int DES_read_2passwords(DES_cblock *key1, DES_cblock *key2, const char *prompt, + int verify); + #define DES_fixup_key_parity DES_set_odd_parity #ifdef __cplusplus |