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.
/assar
Index: crypto/des/des.h
===================================================================
RCS file: /scratch/openssl-box/repo/openssl/crypto/des/des.h,v
retrieving revision 1.39
diff -u -w -r1.39 des.h
--- crypto/des/des.h 2002/01/24 16:15:46 1.39
+++ crypto/des/des.h 2002/02/04 20:15:45
@@ -223,6 +223,9 @@
#define DES_fixup_key_parity DES_set_odd_parity
+/* for DES_read_pw_string et al */
+#include <openssl/ui_compat.h>
+
#ifdef __cplusplus
}
#endif
Index: crypto/des/des_old.c
===================================================================
RCS file: /scratch/openssl-box/repo/openssl/crypto/des/des_old.c,v
retrieving revision 1.9
diff -u -w -r1.9 des_old.c
--- crypto/des/des_old.c 2002/01/26 01:14:02 1.9
+++ crypto/des/des_old.c 2002/02/04 20:28:24
@@ -224,6 +222,26 @@
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);
+ }
+int _ossl_old_des_read_pw_string(char *buf, int length, const char *prompt,
+ int verify)
+ {
+ return DES_read_pw_string(buf, length, prompt, verify);
+ }
+int _ossl_old_des_read_pw(char *buf, char *buff, int length,
+ const char *prompt, int verify)
+ {
+ return DES_read_pw(buf, buff, length, prompt, verify);
}
void _ossl_old_des_set_odd_parity(des_cblock *key)
{
Index: crypto/des/des_old.h
===================================================================
RCS file: /scratch/openssl-box/repo/openssl/crypto/des/des_old.h,v
retrieving revision 1.7
diff -u -w -r1.7 des_old.h
--- crypto/des/des_old.h 2002/01/26 01:14:02 1.7
+++ crypto/des/des_old.h 2002/02/04 20:27:26
@@ -157,14 +157,22 @@
_ossl_old_des_pcbc_encrypt((i),(o),(l),(k),(iv),(e))
#define des_quad_cksum(i,o,l,c,s)\
_ossl_old_des_quad_cksum((i),(o),(l),(c),(s))
-#define des_random_seed(k);\
- _ossl_old_des_random_seed((k));
-#define des_random_key(r);\
- _ossl_old_des_random_key((r));
-#define des_set_odd_parity(k);\
- _ossl_old_des_set_odd_parity((k));
-#define des_is_weak_key(k);\
- _ossl_old_des_is_weak_key((k));
+#define des_random_seed(k)\
+ _ossl_old_des_random_seed((k))
+#define des_random_key(r)\
+ _ossl_old_des_random_key((r))
+#define des_read_password(k,p,v) \
+ _ossl_old_des_read_password((k),(p),(v))
+#define des_read_2passwords(k1,k2,p,v) \
+ _ossl_old_des_read_2passwords((k1),(k2),(p),(v))
+#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_string((b),(bf),(s),(p),(v))
+#define des_set_odd_parity(k)\
+ _ossl_old_des_set_odd_parity((k))
+#define des_is_weak_key(k)\
+ _ossl_old_des_is_weak_key((k))
#define des_set_key(k,ks)\
_ossl_old_des_set_key((k),(ks))
#define des_key_sched(k,ks)\
@@ -247,6 +255,11 @@
long length,int out_count,des_cblock *seed);
void _ossl_old_des_random_seed(des_cblock key);
void _ossl_old_des_random_key(des_cblock ret);
+int _ossl_old_des_read_password(des_cblock *key,const char *prompt,int verify);
+int _ossl_old_des_read_2passwords(des_cblock *key1,des_cblock *key2,
+ const char *prompt,int verify);
+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);
void _ossl_old_des_set_odd_parity(des_cblock *key);
int _ossl_old_des_is_weak_key(des_cblock *key);
int _ossl_old_des_set_key(des_cblock *key,des_key_schedule schedule);
Index: crypto/ui/ui_compat.c
===================================================================
RCS file: /scratch/openssl-box/repo/openssl/crypto/ui/ui_compat.c,v
retrieving revision 1.6
diff -u -w -r1.6 ui_compat.c
--- crypto/ui/ui_compat.c 2001/10/24 21:21:04 1.6
+++ crypto/ui/ui_compat.c 2002/02/04 19:58:21
@@ -61,25 +61,25 @@
#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)
+ if ((ok=DES_read_pw(buf,buff,BUFSIZ,prompt,verify)) == 0)
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)
+ if ((ok=DES_read_pw(buf,buff,BUFSIZ,prompt,verify)) == 0)
DES_string_to_2keys(buf,key1,key2);
memset(buf,0,BUFSIZ);
memset(buff,0,BUFSIZ);
@@ -87,17 +87,17 @@
}
#endif
-int des_read_pw_string(char *buf,int length,const char *prompt,int verify)
+int DES_read_pw_string(char *buf,int length,const char *prompt,int verify)
{
char buff[BUFSIZ];
int ret;
- ret=des_read_pw(buf,buff,(length>BUFSIZ)?BUFSIZ:length,prompt,verify);
+ ret=DES_read_pw(buf,buff,(length>BUFSIZ)?BUFSIZ:length,prompt,verify);
memset(buff,0,BUFSIZ);
return(ret);
}
-int des_read_pw(char *buf,char *buff,int size,const char *prompt,int verify)
+int DES_read_pw(char *buf,char *buff,int size,const char *prompt,int verify)
{
int ok = 0;
UI *ui;
Index: crypto/ui/ui_compat.h
===================================================================
RCS file: /scratch/openssl-box/repo/openssl/crypto/ui/ui_compat.h,v
retrieving revision 1.4
diff -u -w -r1.4 ui_compat.h
--- crypto/ui/ui_compat.h 2001/10/24 21:21:04 1.4
+++ crypto/ui/ui_compat.h 2002/02/04 19:59:49
@@ -73,13 +73,13 @@
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
-int des_read_pw_string(char *buf,int length,const char *prompt,int verify);
-int des_read_pw(char *buf,char *buff,int size,const char *prompt,int verify);
+int DES_read_pw_string(char *buf,int length,const char *prompt,int verify);
+int DES_read_pw(char *buf,char *buff,int size,const char *prompt,int verify);
#ifdef __cplusplus
}
______________________________________________________________________
OpenSSL Project http://www.openssl.org
Development Mailing List [EMAIL PROTECTED]
Automated List Manager [EMAIL PROTECTED]
