generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

I got a request to make the "old des" symbols more closely tied to

Browse Source 
OpenSSL.  Adding '_ossl' in the name seems to be a good way to do
this.
This commit is contained in:
Richard Levitte
2002-01-26 01:14:09 +00:00
parent f14845d999
commit 2d57b73a50
4 changed files with 140 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
crypto/des/des_old.c
View File

@@ -76,11 +76,11 @@
#include <openssl/des.h>
#include <openssl/rand.h>
const char *_old_des_options(void)
const char *_ossl_old_des_options(void)
{
return DES_options();
}
void _old_des_ecb3_encrypt(des_cblock *input,des_cblock *output,
void _ossl_old_des_ecb3_encrypt(des_cblock *input,des_cblock *output,
des_key_schedule ks1,des_key_schedule ks2,
des_key_schedule ks3, int enc)
{
@@ -88,63 +88,63 @@ void _old_des_ecb3_encrypt(des_cblock *input,des_cblock *output,
(DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
(DES_key_schedule *)ks3, enc);
}
DES_LONG _old_des_cbc_cksum(des_cblock *input,des_cblock *output,
DES_LONG _ossl_old_des_cbc_cksum(des_cblock *input,des_cblock *output,
long length,des_key_schedule schedule,des_cblock *ivec)
{
return DES_cbc_cksum((unsigned char *)input, output, length,
(DES_key_schedule *)schedule, ivec);
}
void _old_des_cbc_encrypt(des_cblock *input,des_cblock *output,long length,
void _ossl_old_des_cbc_encrypt(des_cblock *input,des_cblock *output,long length,
des_key_schedule schedule,des_cblock *ivec,int enc)
{
DES_cbc_encrypt((unsigned char *)input, (unsigned char *)output,
length, (DES_key_schedule *)schedule, ivec, enc);
}
void _old_des_ncbc_encrypt(des_cblock *input,des_cblock *output,long length,
void _ossl_old_des_ncbc_encrypt(des_cblock *input,des_cblock *output,long length,
des_key_schedule schedule,des_cblock *ivec,int enc)
{
DES_ncbc_encrypt((unsigned char *)input, (unsigned char *)output,
length, (DES_key_schedule *)schedule, ivec, enc);
}
void _old_des_xcbc_encrypt(des_cblock *input,des_cblock *output,long length,
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)
{
DES_xcbc_encrypt((unsigned char *)input, (unsigned char *)output,
length, (DES_key_schedule *)schedule, ivec, inw, outw, enc);
}
void _old_des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits,
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)
{
DES_cfb_encrypt(in, out, numbits, length,
(DES_key_schedule *)schedule, ivec, enc);
}
void _old_des_ecb_encrypt(des_cblock *input,des_cblock *output,
void _ossl_old_des_ecb_encrypt(des_cblock *input,des_cblock *output,
des_key_schedule ks,int enc)
{
DES_ecb_encrypt(input, output, (DES_key_schedule *)ks, enc);
}
void _old_des_encrypt(DES_LONG *data,des_key_schedule ks, int enc)
void _ossl_old_des_encrypt(DES_LONG *data,des_key_schedule ks, int enc)
{
DES_encrypt1(data, (DES_key_schedule *)ks, enc);
}
void _old_des_encrypt2(DES_LONG *data,des_key_schedule ks, int enc)
void _ossl_old_des_encrypt2(DES_LONG *data,des_key_schedule ks, int enc)
{
DES_encrypt2(data, (DES_key_schedule *)ks, enc);
}
void _old_des_encrypt3(DES_LONG *data, des_key_schedule ks1,
void _ossl_old_des_encrypt3(DES_LONG *data, des_key_schedule ks1,
des_key_schedule ks2, des_key_schedule ks3)
{
DES_encrypt3(data, (DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
(DES_key_schedule *)ks3);
}
void _old_des_decrypt3(DES_LONG *data, des_key_schedule ks1,
void _ossl_old_des_decrypt3(DES_LONG *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 _old_des_ede3_cbc_encrypt(des_cblock *input, des_cblock *output,
void _ossl_old_des_ede3_cbc_encrypt(des_cblock *input, des_cblock *output,
long length, des_key_schedule ks1, des_key_schedule ks2,
des_key_schedule ks3, des_cblock *ivec, int enc)
{
@@ -152,7 +152,7 @@ void _old_des_ede3_cbc_encrypt(des_cblock *input, des_cblock *output,
length, (DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
(DES_key_schedule *)ks3, ivec, enc);
}
void _old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
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)
{
@@ -160,7 +160,7 @@ void _old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
(DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
(DES_key_schedule *)ks3, ivec, num, enc);
}
void _old_des_ede3_ofb64_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,
des_key_schedule ks3, des_cblock *ivec, int *num)
{
@@ -169,93 +169,93 @@ void _old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
(DES_key_schedule *)ks3, ivec, num);
}
void _old_des_xwhite_in2out(des_cblock (*des_key), des_cblock (*in_white),
void _ossl_old_des_xwhite_in2out(des_cblock (*des_key), des_cblock (*in_white),
des_cblock (*out_white))
{
DES_xwhite_in2out(des_key, in_white, out_white);
}
int _old_des_enc_read(int fd,char *buf,int len,des_key_schedule sched,
int _ossl_old_des_enc_read(int fd,char *buf,int len,des_key_schedule sched,
des_cblock *iv)
{
return DES_enc_read(fd, buf, len, (DES_key_schedule *)sched, iv);
}
int _old_des_enc_write(int fd,char *buf,int len,des_key_schedule sched,
int _ossl_old_des_enc_write(int fd,char *buf,int len,des_key_schedule sched,
des_cblock *iv)
{
return DES_enc_write(fd, buf, len, (DES_key_schedule *)sched, iv);
}
char *_old_des_fcrypt(const char *buf,const char *salt, char *ret)
char *_ossl_old_des_fcrypt(const char *buf,const char *salt, char *ret)
{
return DES_fcrypt(buf, salt, ret);
}
char *_old_des_crypt(const char *buf,const char *salt)
char *_ossl_old_des_crypt(const char *buf,const char *salt)
{
return DES_crypt(buf, salt);
}
#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(_DARWIN)
char *_old_crypt(const char *buf,const char *salt)
char *_ossl_old_crypt(const char *buf,const char *salt)
{
return DES_crypt(buf, salt);
}
#endif
void _old_des_ofb_encrypt(unsigned char *in,unsigned char *out,
void _ossl_old_des_ofb_encrypt(unsigned char *in,unsigned char *out,
int numbits,long length,des_key_schedule schedule,des_cblock *ivec)
{
DES_ofb_encrypt(in, out, numbits, length, (DES_key_schedule *)schedule,
ivec);
}
void _old_des_pcbc_encrypt(des_cblock *input,des_cblock *output,long length,
void _ossl_old_des_pcbc_encrypt(des_cblock *input,des_cblock *output,long length,
des_key_schedule schedule,des_cblock *ivec,int enc)
{
DES_pcbc_encrypt((unsigned char *)input, (unsigned char *)output,
length, (DES_key_schedule *)schedule, ivec, enc);
}
DES_LONG _old_des_quad_cksum(des_cblock *input,des_cblock *output,
DES_LONG _ossl_old_des_quad_cksum(des_cblock *input,des_cblock *output,
long length,int out_count,des_cblock *seed)
{
return DES_quad_cksum((unsigned char *)input, output, length,
out_count, seed);
}
void _old_des_random_seed(des_cblock key)
void _ossl_old_des_random_seed(des_cblock key)
{
RAND_seed(key, sizeof(des_cblock));
}
void _old_des_random_key(des_cblock ret)
void _ossl_old_des_random_key(des_cblock ret)
{
DES_random_key((DES_cblock *)ret);
}
void _old_des_set_odd_parity(des_cblock *key)
void _ossl_old_des_set_odd_parity(des_cblock *key)
{
DES_set_odd_parity(key);
}
int _old_des_is_weak_key(des_cblock *key)
int _ossl_old_des_is_weak_key(des_cblock *key)
{
return DES_is_weak_key(key);
}
int _old_des_set_key(des_cblock *key,des_key_schedule schedule)
int _ossl_old_des_set_key(des_cblock *key,des_key_schedule schedule)
{
return DES_set_key(key, (DES_key_schedule *)schedule);
}
int _old_des_key_sched(des_cblock *key,des_key_schedule schedule)
int _ossl_old_des_key_sched(des_cblock *key,des_key_schedule schedule)
{
return DES_key_sched(key, (DES_key_schedule *)schedule);
}
void _old_des_string_to_key(char *str,des_cblock *key)
void _ossl_old_des_string_to_key(char *str,des_cblock *key)
{
DES_string_to_key(str, key);
}
void _old_des_string_to_2keys(char *str,des_cblock *key1,des_cblock *key2)
void _ossl_old_des_string_to_2keys(char *str,des_cblock *key1,des_cblock *key2)
{
DES_string_to_2keys(str, key1, key2);
}
void _old_des_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
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_cfb64_encrypt(in, out, length, (DES_key_schedule *)schedule,
ivec, num, enc);
}
void _old_des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
void _ossl_old_des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
des_key_schedule schedule, des_cblock *ivec, int *num)
{
DES_ofb64_encrypt(in, out, length, (DES_key_schedule *)schedule,