oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

switch to the DES_ api, dont provide any compat glue

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12748 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-09-03 09:26:03 +00:00
parent 992f32ca35
commit 49e0243cc5
29 changed files with 590 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

300
lib/des/des.h
View File

@@ -56,8 +56,8 @@
* [including the GNU Public Licence.]
*/
#ifndef HEADER_DES_H
#define HEADER_DES_H
#ifndef HEADER_NEW_DES_H
#define HEADER_NEW_DES_H
#ifdef __cplusplus
extern "C" {
@@ -85,21 +85,21 @@ extern "C" {
#endif
#endif
typedef unsigned char des_cblock[8];
typedef struct des_ks_struct
typedef unsigned char DES_cblock[8];
typedef struct DES_ks_struct
{
union {
des_cblock _;
DES_cblock _;
/* make sure things are correct size on machines with
* 8 byte longs */
DES_LONG pad[2];
} ks;
} ks[16];
#undef _
#define _ ks._
} des_key_schedule[16];
} DES_key_schedule;
#define DES_KEY_SZ (sizeof(des_cblock))
#define DES_SCHEDULE_SZ (sizeof(des_key_schedule))
#define DES_KEY_SZ (sizeof(DES_cblock))
#define DES_SCHEDULE_SZ (sizeof(DES_key_schedule))
#define DES_ENCRYPT 1
#define DES_DECRYPT 0
@@ -107,45 +107,49 @@ typedef struct des_ks_struct
#define DES_CBC_MODE 0
#define DES_PCBC_MODE 1
#define des_ecb2_encrypt(i,o,k1,k2,e) \
des_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
#define DES_ecb2_encrypt(i,o,k1,k2,e) \
DES_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
#define des_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
#define DES_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
DES_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
#define des_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
#define DES_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
DES_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
#define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
#define DES_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
DES_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
#define C_Block DES_cblock
#define Key_schedule DES_key_schedule
/* some glue for openssl compat */
#define UI_UTIL_read_pw_string DES_read_pw_string
#define C_Block des_cblock
#define Key_schedule des_key_schedule
#ifdef KERBEROS
#define ENCRYPT DES_ENCRYPT
#define DECRYPT DES_DECRYPT
#endif
#define KEY_SZ DES_KEY_SZ
#define string_to_key des_string_to_key
#define read_pw_string des_read_pw_string
#define random_key des_random_key
#define pcbc_encrypt des_pcbc_encrypt
#define set_key des_set_key
#define key_sched des_key_sched
#define ecb_encrypt des_ecb_encrypt
#define cbc_encrypt des_cbc_encrypt
#define ncbc_encrypt des_ncbc_encrypt
#define xcbc_encrypt des_xcbc_encrypt
#define cbc_cksum des_cbc_cksum
#define quad_cksum des_quad_cksum
#define string_to_key DES_string_to_key
#define read_pw_string DES_read_pw_string
#define random_key DES_random_key
#define pcbc_encrypt DES_pcbc_encrypt
#define set_key DES_set_key
#define key_sched DES_key_sched
#define ecb_encrypt DES_ecb_encrypt
#define cbc_encrypt DES_cbc_encrypt
#define ncbc_encrypt DES_ncbc_encrypt
#define xcbc_encrypt DES_xcbc_encrypt
#define cbc_cksum DES_cbc_cksum
#define quad_cksum DES_quad_cksum
/* For compatibility with the MIT lib - eay 20/05/92 */
typedef des_key_schedule bit_64;
#define des_fixup_key_parity des_set_odd_parity
#define des_check_key_parity check_parity
typedef DES_key_schedule bit_64;
#define DES_fixup_key_parity DES_set_odd_parity
#define DES_check_key_parity check_parity
extern int des_check_key; /* defaults to false */
extern int des_rw_mode; /* defaults to DES_PCBC_MODE */
extern int DES_check_key; /* defaults to false */
extern int DES_rw_mode; /* defaults to DES_PCBC_MODE */
#ifdef cplusplus
extern "C" {
@@ -158,49 +162,49 @@ extern "C" {
#undef NOPROTO
#endif
#ifndef NOPROTO
char *DES_LIB_FUNCTION des_options(void);
void DES_LIB_FUNCTION des_ecb3_encrypt(des_cblock *input,des_cblock *output,
des_key_schedule ks1,des_key_schedule ks2,
des_key_schedule ks3, int enc);
DES_LONG DES_LIB_FUNCTION des_cbc_cksum(des_cblock *input,des_cblock *output,
long length,des_key_schedule schedule,des_cblock *ivec);
void DES_LIB_FUNCTION des_cbc_encrypt(des_cblock *input,des_cblock *output,long length,
des_key_schedule schedule,des_cblock *ivec,int enc);
void DES_LIB_FUNCTION des_ncbc_encrypt(des_cblock *input,des_cblock *output,long length,
des_key_schedule schedule,des_cblock *ivec,int enc);
void DES_LIB_FUNCTION 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 DES_LIB_FUNCTION des_3cbc_encrypt(des_cblock *input,des_cblock *output,long length,
des_key_schedule sk1,des_key_schedule sk2,
des_cblock *ivec1,des_cblock *ivec2,int enc);
void DES_LIB_FUNCTION des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits,
long length,des_key_schedule schedule,des_cblock *ivec,int enc);
void DES_LIB_FUNCTION des_ecb_encrypt(des_cblock *input,des_cblock *output,
des_key_schedule ks,int enc);
void DES_LIB_FUNCTION des_encrypt(DES_LONG *data,des_key_schedule ks, int enc);
void DES_LIB_FUNCTION des_encrypt2(DES_LONG *data,des_key_schedule ks, int enc);
void DES_LIB_FUNCTION des_encrypt3(DES_LONG *data, des_key_schedule ks1,
des_key_schedule ks2, des_key_schedule ks3);
void DES_LIB_FUNCTION des_decrypt3(DES_LONG *data, des_key_schedule ks1,
des_key_schedule ks2, des_key_schedule ks3);
void DES_LIB_FUNCTION 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);
void DES_LIB_FUNCTION 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 encrypt);
void DES_LIB_FUNCTION 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);
char *DES_LIB_FUNCTION DES_options(void);
void DES_LIB_FUNCTION DES_ecb3_encrypt(DES_cblock *input,DES_cblock *output,
DES_key_schedule *ks1,DES_key_schedule *ks2,
DES_key_schedule *ks3, int enc);
DES_LONG DES_LIB_FUNCTION DES_cbc_cksum(DES_cblock *input,DES_cblock *output,
long length,DES_key_schedule *schedule,DES_cblock *ivec);
void DES_LIB_FUNCTION DES_cbc_encrypt(DES_cblock *input,DES_cblock *output,long length,
DES_key_schedule *schedule,DES_cblock *ivec,int enc);
void DES_LIB_FUNCTION DES_ncbc_encrypt(DES_cblock *input,DES_cblock *output,long length,
DES_key_schedule *schedule,DES_cblock *ivec,int enc);
void DES_LIB_FUNCTION 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 DES_LIB_FUNCTION DES_3cbc_encrypt(DES_cblock *input,DES_cblock *output,long length,
DES_key_schedule *sk1,DES_key_schedule *sk2,
DES_cblock *ivec1,DES_cblock *ivec2,int enc);
void DES_LIB_FUNCTION DES_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits,
long length,DES_key_schedule *schedule,DES_cblock *ivec,int enc);
void DES_LIB_FUNCTION DES_ecb_encrypt(DES_cblock *input,DES_cblock *output,
DES_key_schedule *ks,int enc);
void DES_LIB_FUNCTION DES_encrypt(DES_LONG *data,DES_key_schedule *ks, int enc);
void DES_LIB_FUNCTION DES_encrypt2(DES_LONG *data,DES_key_schedule *ks, int enc);
void DES_LIB_FUNCTION DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1,
DES_key_schedule *ks2, DES_key_schedule *ks3);
void DES_LIB_FUNCTION DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
DES_key_schedule *ks2, DES_key_schedule *ks3);
void DES_LIB_FUNCTION 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);
void DES_LIB_FUNCTION 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 encrypt);
void DES_LIB_FUNCTION 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);
int DES_LIB_FUNCTION des_enc_read(int fd,char *buf,int len,des_key_schedule sched,
des_cblock *iv);
int DES_LIB_FUNCTION des_enc_write(int fd,char *buf,int len,des_key_schedule sched,
des_cblock *iv);
char *DES_LIB_FUNCTION des_fcrypt(const char *buf,const char *salt, char *ret);
int DES_LIB_FUNCTION DES_enc_read(int fd,char *buf,int len,DES_key_schedule *sched,
DES_cblock *iv);
int DES_LIB_FUNCTION DES_enc_write(int fd,char *buf,int len,DES_key_schedule *sched,
DES_cblock *iv);
char *DES_LIB_FUNCTION DES_fcrypt(const char *buf,const char *salt, char *ret);
#ifdef PERL5
char *des_crypt(const char *buf,const char *salt);
char *DES_crypt(const char *buf,const char *salt);
#else
/* some stupid compilers complain because I have declared char instead
* of const char */
@@ -210,95 +214,95 @@ char *DES_LIB_FUNCTION crypt(const char *buf,const char *salt);
char *crypt();
#endif
#endif
void DES_LIB_FUNCTION des_ofb_encrypt(unsigned char *in,unsigned char *out,
int numbits,long length,des_key_schedule schedule,des_cblock *ivec);
void DES_LIB_FUNCTION des_pcbc_encrypt(des_cblock *input,des_cblock *output,long length,
des_key_schedule schedule,des_cblock *ivec,int enc);
DES_LONG DES_LIB_FUNCTION des_quad_cksum(des_cblock *input,des_cblock *output,
long length,int out_count,des_cblock *seed);
void DES_LIB_FUNCTION des_random_seed(des_cblock key);
void DES_LIB_FUNCTION des_random_key(des_cblock ret);
int DES_LIB_FUNCTION des_read_password(des_cblock *key,char *prompt,int verify);
int DES_LIB_FUNCTION des_read_2passwords(des_cblock *key1,des_cblock *key2,
void DES_LIB_FUNCTION DES_ofb_encrypt(unsigned char *in,unsigned char *out,
int numbits,long length,DES_key_schedule *schedule,DES_cblock *ivec);
void DES_LIB_FUNCTION DES_pcbc_encrypt(DES_cblock *input,DES_cblock *output,long length,
DES_key_schedule *schedule,DES_cblock *ivec,int enc);
DES_LONG DES_LIB_FUNCTION DES_quad_cksum(DES_cblock *input,DES_cblock *output,
long length,int out_count,DES_cblock *seed);
void DES_LIB_FUNCTION DES_random_seed(DES_cblock key);
void DES_LIB_FUNCTION DES_random_key(DES_cblock ret);
int DES_LIB_FUNCTION DES_read_password(DES_cblock *key,char *prompt,int verify);
int DES_LIB_FUNCTION DES_read_2passwords(DES_cblock *key1,DES_cblock *key2,
char *prompt,int verify);
int DES_LIB_FUNCTION des_read_pw_string(char *buf,int length,char *prompt,int verify);
void DES_LIB_FUNCTION des_set_odd_parity(des_cblock *key);
int DES_LIB_FUNCTION des_is_weak_key(des_cblock *key);
int DES_LIB_FUNCTION des_set_key(des_cblock *key,des_key_schedule schedule);
int DES_LIB_FUNCTION des_key_sched(des_cblock *key,des_key_schedule schedule);
void DES_LIB_FUNCTION des_string_to_key(char *str,des_cblock *key);
void DES_LIB_FUNCTION des_string_to_2keys(char *str,des_cblock *key1,des_cblock *key2);
void DES_LIB_FUNCTION des_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
des_key_schedule schedule, des_cblock *ivec, int *num, int enc);
void DES_LIB_FUNCTION des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
des_key_schedule schedule, des_cblock *ivec, int *num);
int DES_LIB_FUNCTION DES_read_pw_string(char *buf,int length,char *prompt,int verify);
void DES_LIB_FUNCTION DES_set_odd_parity(DES_cblock *key);
int DES_LIB_FUNCTION DES_is_weak_key(DES_cblock *key);
int DES_LIB_FUNCTION DES_set_key(DES_cblock *key,DES_key_schedule *schedule);
int DES_LIB_FUNCTION DES_key_sched(DES_cblock *key,DES_key_schedule *schedule);
void DES_LIB_FUNCTION DES_string_to_key(char *str,DES_cblock *key);
void DES_LIB_FUNCTION DES_string_to_2keys(char *str,DES_cblock *key1,DES_cblock *key2);
void DES_LIB_FUNCTION DES_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
DES_key_schedule *schedule, DES_cblock *ivec, int *num, int enc);
void DES_LIB_FUNCTION DES_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
DES_key_schedule *schedule, DES_cblock *ivec, int *num);
/* Extra functions from Mark Murray <mark@grondar.za> */
void DES_LIB_FUNCTION des_cblock_print_file(des_cblock *cb, FILE *fp);
void DES_LIB_FUNCTION DES_cblock_print_file(DES_cblock *cb, FILE *fp);
/* The following functions are not in the normal unix build or the
* SSLeay build. When using the SSLeay build, use RAND_seed()
* and RAND_bytes() instead. */
int DES_LIB_FUNCTION des_new_random_key(des_cblock *key);
void DES_LIB_FUNCTION des_init_random_number_generator(des_cblock *key);
void DES_LIB_FUNCTION des_set_random_generator_seed(des_cblock *key);
void DES_LIB_FUNCTION des_set_sequence_number(des_cblock new_sequence_number);
void DES_LIB_FUNCTION des_generate_random_block(des_cblock *block);
void DES_LIB_FUNCTION des_rand_data(unsigned char *data, int size);
int DES_LIB_FUNCTION DES_new_random_key(DES_cblock *key);
void DES_LIB_FUNCTION DES_init_random_number_generator(DES_cblock *key);
void DES_LIB_FUNCTION DES_set_random_generator_seed(DES_cblock *key);
void DES_LIB_FUNCTION DES_set_sequence_number(DES_cblock new_sequence_number);
void DES_LIB_FUNCTION DES_generate_random_block(DES_cblock *block);
void DES_LIB_FUNCTION DES_rand_data(unsigned char *data, int size);
#else
char *des_options();
void des_ecb3_encrypt();
DES_LONG des_cbc_cksum();
void des_cbc_encrypt();
void des_ncbc_encrypt();
void des_xcbc_encrypt();
void des_3cbc_encrypt();
void des_cfb_encrypt();
void des_ede3_cfb64_encrypt();
void des_ede3_ofb64_encrypt();
void des_ecb_encrypt();
void des_encrypt();
void des_encrypt2();
void des_encrypt3();
void des_decrypt3();
void des_ede3_cbc_encrypt();
int des_enc_read();
int des_enc_write();
char *des_fcrypt();
char *DES_options();
void DES_ecb3_encrypt();
DES_LONG DES_cbc_cksum();
void DES_cbc_encrypt();
void DES_ncbc_encrypt();
void DES_xcbc_encrypt();
void DES_3cbc_encrypt();
void DES_cfb_encrypt();
void DES_ede3_cfb64_encrypt();
void DES_ede3_ofb64_encrypt();
void DES_ecb_encrypt();
void DES_encrypt();
void DES_encrypt2();
void DES_encrypt3();
void DES_decrypt3();
void DES_ede3_cbc_encrypt();
int DES_enc_read();
int DES_enc_write();
char *DES_fcrypt();
#ifdef PERL5
char *des_crypt();
char *DES_crypt();
#else
char *crypt();
#endif
void des_ofb_encrypt();
void des_pcbc_encrypt();
DES_LONG des_quad_cksum();
void des_random_seed();
void des_random_key();
int des_read_password();
int des_read_2passwords();
int des_read_pw_string();
void des_set_odd_parity();
int des_is_weak_key();
int des_set_key();
int des_key_sched();
void des_string_to_key();
void des_string_to_2keys();
void des_cfb64_encrypt();
void des_ofb64_encrypt();
void DES_ofb_encrypt();
void DES_pcbc_encrypt();
DES_LONG DES_quad_cksum();
void DES_random_seed();
void DES_random_key();
int DES_read_password();
int DES_read_2passwords();
int DES_read_pw_string();
void DES_set_odd_parity();
int DES_is_weak_key();
int DES_set_key();
int DES_key_sched();
void DES_string_to_key();
void DES_string_to_2keys();
void DES_cfb64_encrypt();
void DES_ofb64_encrypt();
/* Extra functions from Mark Murray <mark@grondar.za> */
void des_cblock_print_file();
void DES_cblock_print_file();
/* The following functions are not in the normal unix build or the
* SSLeay build. When using the SSLeay build, use RAND_seed()
* and RAND_bytes() instead. */
int des_new_random_key();
void des_init_random_number_generator();
void des_set_random_generator_seed();
void des_set_sequence_number();
void des_generate_random_block();
void des_rand_data();
int DES_new_random_key();
void DES_init_random_number_generator();
void DES_set_random_generator_seed();
void DES_set_sequence_number();
void DES_generate_random_block();
void DES_rand_data();
#endif