projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
91aeab0
)
Change des_old.c to use types prefixed with _ossl_old_des_.
author
Richard Levitte
<levitte@openssl.org>
Thu, 7 Mar 2002 15:38:40 +0000
(15:38 +0000)
committer
Richard Levitte
<levitte@openssl.org>
Thu, 7 Mar 2002 15:38:40 +0000
(15:38 +0000)
crypto/des/des_old.c
patch
|
blob
|
history
diff --git
a/crypto/des/des_old.c
b/crypto/des/des_old.c
index e6cc1ce22d36b5beb6aa773c0a454179f6bbc29a..e1c82da9b46192f5d06d196551279c43ccd1ddec 100644
(file)
--- a/
crypto/des/des_old.c
+++ b/
crypto/des/des_old.c
@@
-80,7
+80,7
@@
const char *_ossl_old_des_options(void)
{
return DES_options();
}
{
return DES_options();
}
-void _ossl_old_des_ecb3_encrypt(
des_cblock *input,
des_cblock *output,
+void _ossl_old_des_ecb3_encrypt(
_ossl_old_des_cblock *input,_ossl_old_
des_cblock *output,
des_key_schedule ks1,des_key_schedule ks2,
des_key_schedule ks3, int enc)
{
des_key_schedule ks1,des_key_schedule ks2,
des_key_schedule ks3, int enc)
{
@@
-88,38
+88,38
@@
void _ossl_old_des_ecb3_encrypt(des_cblock *input,des_cblock *output,
(DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
(DES_key_schedule *)ks3, enc);
}
(DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
(DES_key_schedule *)ks3, enc);
}
-DES_LONG _ossl_old_des_cbc_cksum(
des_cblock *input,
des_cblock *output,
- long length,des_key_schedule schedule,des_cblock *ivec)
+DES_LONG _ossl_old_des_cbc_cksum(
_ossl_old_des_cblock *input,_ossl_old_
des_cblock *output,
+ long length,des_key_schedule schedule,
_ossl_old_
des_cblock *ivec)
{
return DES_cbc_cksum((unsigned char *)input, output, length,
(DES_key_schedule *)schedule, ivec);
}
{
return DES_cbc_cksum((unsigned char *)input, output, length,
(DES_key_schedule *)schedule, ivec);
}
-void _ossl_old_des_cbc_encrypt(
des_cblock *input,
des_cblock *output,long length,
- des_key_schedule schedule,des_cblock *ivec,int enc)
+void _ossl_old_des_cbc_encrypt(
_ossl_old_des_cblock *input,_ossl_old_
des_cblock *output,long length,
+ des_key_schedule schedule,
_ossl_old_
des_cblock *ivec,int enc)
{
DES_cbc_encrypt((unsigned char *)input, (unsigned char *)output,
length, (DES_key_schedule *)schedule, ivec, enc);
}
{
DES_cbc_encrypt((unsigned char *)input, (unsigned char *)output,
length, (DES_key_schedule *)schedule, ivec, enc);
}
-void _ossl_old_des_ncbc_encrypt(
des_cblock *input,
des_cblock *output,long length,
- des_key_schedule schedule,des_cblock *ivec,int enc)
+void _ossl_old_des_ncbc_encrypt(
_ossl_old_des_cblock *input,_ossl_old_
des_cblock *output,long length,
+ des_key_schedule schedule,
_ossl_old_
des_cblock *ivec,int enc)
{
DES_ncbc_encrypt((unsigned char *)input, (unsigned char *)output,
length, (DES_key_schedule *)schedule, ivec, enc);
}
{
DES_ncbc_encrypt((unsigned char *)input, (unsigned char *)output,
length, (DES_key_schedule *)schedule, ivec, enc);
}
-void _ossl_old_des_xcbc_encrypt(
des_cblock *input,
des_cblock *output,long length,
- des_key_schedule schedule,des_cblock *ivec,
-
des_cblock *inw,
des_cblock *outw,int enc)
+void _ossl_old_des_xcbc_encrypt(
_ossl_old_des_cblock *input,_ossl_old_
des_cblock *output,long length,
+ des_key_schedule schedule,
_ossl_old_
des_cblock *ivec,
+
_ossl_old_des_cblock *inw,_ossl_old_
des_cblock *outw,int enc)
{
DES_xcbc_encrypt((unsigned char *)input, (unsigned char *)output,
length, (DES_key_schedule *)schedule, ivec, inw, outw, enc);
}
void _ossl_old_des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits,
{
DES_xcbc_encrypt((unsigned char *)input, (unsigned char *)output,
length, (DES_key_schedule *)schedule, ivec, inw, outw, enc);
}
void _ossl_old_des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits,
- long length,des_key_schedule schedule,des_cblock *ivec,int enc)
+ long length,des_key_schedule schedule,
_ossl_old_
des_cblock *ivec,int enc)
{
DES_cfb_encrypt(in, out, numbits, length,
(DES_key_schedule *)schedule, ivec, enc);
}
{
DES_cfb_encrypt(in, out, numbits, length,
(DES_key_schedule *)schedule, ivec, enc);
}
-void _ossl_old_des_ecb_encrypt(
des_cblock *input,
des_cblock *output,
+void _ossl_old_des_ecb_encrypt(
_ossl_old_des_cblock *input,_ossl_old_
des_cblock *output,
des_key_schedule ks,int enc)
{
DES_ecb_encrypt(input, output, (DES_key_schedule *)ks, enc);
des_key_schedule ks,int enc)
{
DES_ecb_encrypt(input, output, (DES_key_schedule *)ks, enc);
@@
-144,9
+144,9
@@
void _ossl_old_des_decrypt3(DES_LONG *data, des_key_schedule ks1,
DES_decrypt3(data, (DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
(DES_key_schedule *)ks3);
}
DES_decrypt3(data, (DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
(DES_key_schedule *)ks3);
}
-void _ossl_old_des_ede3_cbc_encrypt(
des_cblock *input,
des_cblock *output,
+void _ossl_old_des_ede3_cbc_encrypt(
_ossl_old_des_cblock *input, _ossl_old_
des_cblock *output,
long length, des_key_schedule ks1, des_key_schedule ks2,
long length, des_key_schedule ks1, des_key_schedule ks2,
- des_key_schedule ks3, des_cblock *ivec, int enc)
+ des_key_schedule ks3,
_ossl_old_
des_cblock *ivec, int enc)
{
DES_ede3_cbc_encrypt((unsigned char *)input, (unsigned char *)output,
length, (DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
{
DES_ede3_cbc_encrypt((unsigned char *)input, (unsigned char *)output,
length, (DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
@@
-154,7
+154,7
@@
void _ossl_old_des_ede3_cbc_encrypt(des_cblock *input, des_cblock *output,
}
void _ossl_old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
long length, des_key_schedule ks1, des_key_schedule ks2,
}
void _ossl_old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
long length, des_key_schedule ks1, des_key_schedule ks2,
- des_key_schedule ks3, des_cblock *ivec, int *num, int enc)
+ des_key_schedule ks3,
_ossl_old_
des_cblock *ivec, int *num, int enc)
{
DES_ede3_cfb64_encrypt(in, out, length,
(DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
{
DES_ede3_cfb64_encrypt(in, out, length,
(DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
@@
-162,26
+162,26
@@
void _ossl_old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
}
void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
long length, des_key_schedule ks1, des_key_schedule ks2,
}
void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
long length, des_key_schedule ks1, des_key_schedule ks2,
- des_key_schedule ks3, des_cblock *ivec, int *num)
+ des_key_schedule ks3,
_ossl_old_
des_cblock *ivec, int *num)
{
DES_ede3_ofb64_encrypt(in, out, length,
(DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
(DES_key_schedule *)ks3, ivec, num);
}
{
DES_ede3_ofb64_encrypt(in, out, length,
(DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
(DES_key_schedule *)ks3, ivec, num);
}
-void _ossl_old_des_xwhite_in2out(
des_cblock (*des_key),
des_cblock (*in_white),
- des_cblock (*out_white))
+void _ossl_old_des_xwhite_in2out(
_ossl_old_des_cblock (*des_key), _ossl_old_
des_cblock (*in_white),
+
_ossl_old_
des_cblock (*out_white))
{
DES_xwhite_in2out(des_key, in_white, out_white);
}
int _ossl_old_des_enc_read(int fd,char *buf,int len,des_key_schedule sched,
{
DES_xwhite_in2out(des_key, in_white, out_white);
}
int _ossl_old_des_enc_read(int fd,char *buf,int len,des_key_schedule sched,
- des_cblock *iv)
+
_ossl_old_
des_cblock *iv)
{
return DES_enc_read(fd, buf, len, (DES_key_schedule *)sched, iv);
}
int _ossl_old_des_enc_write(int fd,char *buf,int len,des_key_schedule sched,
{
return DES_enc_read(fd, buf, len, (DES_key_schedule *)sched, iv);
}
int _ossl_old_des_enc_write(int fd,char *buf,int len,des_key_schedule sched,
- des_cblock *iv)
+
_ossl_old_
des_cblock *iv)
{
return DES_enc_write(fd, buf, len, (DES_key_schedule *)sched, iv);
}
{
return DES_enc_write(fd, buf, len, (DES_key_schedule *)sched, iv);
}
@@
-198,73
+198,73
@@
char *_ossl_old_crypt(const char *buf,const char *salt)
return DES_crypt(buf, salt);
}
void _ossl_old_des_ofb_encrypt(unsigned char *in,unsigned char *out,
return DES_crypt(buf, salt);
}
void _ossl_old_des_ofb_encrypt(unsigned char *in,unsigned char *out,
- int numbits,long length,des_key_schedule schedule,des_cblock *ivec)
+ int numbits,long length,des_key_schedule schedule,
_ossl_old_
des_cblock *ivec)
{
DES_ofb_encrypt(in, out, numbits, length, (DES_key_schedule *)schedule,
ivec);
}
{
DES_ofb_encrypt(in, out, numbits, length, (DES_key_schedule *)schedule,
ivec);
}
-void _ossl_old_des_pcbc_encrypt(
des_cblock *input,
des_cblock *output,long length,
- des_key_schedule schedule,des_cblock *ivec,int enc)
+void _ossl_old_des_pcbc_encrypt(
_ossl_old_des_cblock *input,_ossl_old_
des_cblock *output,long length,
+ des_key_schedule schedule,
_ossl_old_
des_cblock *ivec,int enc)
{
DES_pcbc_encrypt((unsigned char *)input, (unsigned char *)output,
length, (DES_key_schedule *)schedule, ivec, enc);
}
{
DES_pcbc_encrypt((unsigned char *)input, (unsigned char *)output,
length, (DES_key_schedule *)schedule, ivec, enc);
}
-DES_LONG _ossl_old_des_quad_cksum(
des_cblock *input,
des_cblock *output,
- long length,int out_count,des_cblock *seed)
+DES_LONG _ossl_old_des_quad_cksum(
_ossl_old_des_cblock *input,_ossl_old_
des_cblock *output,
+ long length,int out_count,
_ossl_old_
des_cblock *seed)
{
return DES_quad_cksum((unsigned char *)input, output, length,
out_count, seed);
}
{
return DES_quad_cksum((unsigned char *)input, output, length,
out_count, seed);
}
-void _ossl_old_des_random_seed(des_cblock key)
+void _ossl_old_des_random_seed(
_ossl_old_
des_cblock key)
{
{
- RAND_seed(key, sizeof(des_cblock));
+ RAND_seed(key, sizeof(
_ossl_old_
des_cblock));
}
}
-void _ossl_old_des_random_key(des_cblock ret)
+void _ossl_old_des_random_key(
_ossl_old_
des_cblock ret)
{
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 _ossl_old_des_read_password(
_ossl_old_
des_cblock *key, const char *prompt,
int verify)
{
return DES_read_password(key, prompt, verify);
}
int verify)
{
return DES_read_password(key, prompt, verify);
}
-int _ossl_old_des_read_2passwords(
des_cblock *key1,
des_cblock *key2,
+int _ossl_old_des_read_2passwords(
_ossl_old_des_cblock *key1, _ossl_old_
des_cblock *key2,
const char *prompt, int verify)
{
return DES_read_2passwords(key1, key2, prompt, verify);
}
const char *prompt, int verify)
{
return DES_read_2passwords(key1, key2, prompt, verify);
}
-void _ossl_old_des_set_odd_parity(des_cblock *key)
+void _ossl_old_des_set_odd_parity(
_ossl_old_
des_cblock *key)
{
DES_set_odd_parity(key);
}
{
DES_set_odd_parity(key);
}
-int _ossl_old_des_is_weak_key(des_cblock *key)
+int _ossl_old_des_is_weak_key(
_ossl_old_
des_cblock *key)
{
return DES_is_weak_key(key);
}
{
return DES_is_weak_key(key);
}
-int _ossl_old_des_set_key(des_cblock *key,des_key_schedule schedule)
+int _ossl_old_des_set_key(
_ossl_old_
des_cblock *key,des_key_schedule schedule)
{
return DES_set_key(key, (DES_key_schedule *)schedule);
}
{
return DES_set_key(key, (DES_key_schedule *)schedule);
}
-int _ossl_old_des_key_sched(des_cblock *key,des_key_schedule schedule)
+int _ossl_old_des_key_sched(
_ossl_old_
des_cblock *key,des_key_schedule schedule)
{
return DES_key_sched(key, (DES_key_schedule *)schedule);
}
{
return DES_key_sched(key, (DES_key_schedule *)schedule);
}
-void _ossl_old_des_string_to_key(char *str,des_cblock *key)
+void _ossl_old_des_string_to_key(char *str,
_ossl_old_
des_cblock *key)
{
DES_string_to_key(str, key);
}
{
DES_string_to_key(str, key);
}
-void _ossl_old_des_string_to_2keys(char *str,
des_cblock *key1,
des_cblock *key2)
+void _ossl_old_des_string_to_2keys(char *str,
_ossl_old_des_cblock *key1,_ossl_old_
des_cblock *key2)
{
DES_string_to_2keys(str, key1, key2);
}
void _ossl_old_des_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
{
DES_string_to_2keys(str, key1, key2);
}
void _ossl_old_des_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
- des_key_schedule schedule, des_cblock *ivec, int *num, int enc)
+ des_key_schedule schedule,
_ossl_old_
des_cblock *ivec, int *num, int enc)
{
DES_cfb64_encrypt(in, out, length, (DES_key_schedule *)schedule,
ivec, num, enc);
}
void _ossl_old_des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
{
DES_cfb64_encrypt(in, out, length, (DES_key_schedule *)schedule,
ivec, num, enc);
}
void _ossl_old_des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
- des_key_schedule schedule, des_cblock *ivec, int *num)
+ des_key_schedule schedule,
_ossl_old_
des_cblock *ivec, int *num)
{
DES_ofb64_encrypt(in, out, length, (DES_key_schedule *)schedule,
ivec, num);
{
DES_ofb64_encrypt(in, out, length, (DES_key_schedule *)schedule,
ivec, num);