diff options
| author | Richard Levitte <levitte@openssl.org> | 2001-10-24 21:21:12 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2001-10-24 21:21:12 +0000 |
| commit | c2e4f17c1a0d4d5115c6ede9492de1615fe392ac (patch) | |
| tree | 14dda5edeaebac01b4baa3aa026c40a784a44266 /crypto/ui | |
| parent | 979689aa5cfa100ccbc1f25064e9398be4b7b05c (diff) | |
Due to an increasing number of clashes between modern OpenSSL and
libdes (which is still used out there) or other des implementations,
the OpenSSL DES functions are renamed to begin with DES_ instead of
des_. Compatibility routines are provided and declared by including
openssl/des_old.h. Those declarations are the same as were in des.h
when the OpenSSL project started, which is exactly how libdes looked
at that time, and hopefully still looks today.
The compatibility functions will be removed in some future release, at
the latest in version 1.0.
Diffstat (limited to 'crypto/ui')
| -rw-r--r-- | crypto/ui/ui_compat.c | 8 | ||||
| -rw-r--r-- | crypto/ui/ui_compat.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/crypto/ui/ui_compat.c b/crypto/ui/ui_compat.c index 701c07c181..2b4429416f 100644 --- a/crypto/ui/ui_compat.c +++ b/crypto/ui/ui_compat.c @@ -61,26 +61,26 @@ #include <openssl/ui_compat.h> #ifndef OPENSSL_NO_DES -int des_read_password(des_cblock *key, const char *prompt, int verify) +int des_read_password(DES_cblock *key, const char *prompt, int verify) { int ok; char buf[BUFSIZ],buff[BUFSIZ]; if ((ok=des_read_pw(buf,buff,BUFSIZ,prompt,verify)) == 0) - des_string_to_key(buf,key); + DES_string_to_key(buf,key); memset(buf,0,BUFSIZ); memset(buff,0,BUFSIZ); return(ok); } -int des_read_2passwords(des_cblock *key1, des_cblock *key2, const char *prompt, +int des_read_2passwords(DES_cblock *key1, DES_cblock *key2, const char *prompt, int verify) { int ok; char buf[BUFSIZ],buff[BUFSIZ]; if ((ok=des_read_pw(buf,buff,BUFSIZ,prompt,verify)) == 0) - des_string_to_2keys(buf,key1,key2); + DES_string_to_2keys(buf,key1,key2); memset(buf,0,BUFSIZ); memset(buff,0,BUFSIZ); return(ok); diff --git a/crypto/ui/ui_compat.h b/crypto/ui/ui_compat.h index 6e547b6ceb..a7f62a4751 100644 --- a/crypto/ui/ui_compat.h +++ b/crypto/ui/ui_compat.h @@ -73,8 +73,8 @@ extern "C" { and are provided here for backward compatibility reasons. */ #ifndef OPENSSL_NO_DES -int des_read_password(des_cblock *key,const char *prompt,int verify); -int des_read_2passwords(des_cblock *key1,des_cblock *key2, +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); #endif |