Libdes updated to 3.23
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@513 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
		| @@ -50,6 +50,12 @@ | ||||
|  | ||||
| #include <stdio.h> | ||||
|  | ||||
| /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a | ||||
|  * %20 speed up (longs are 8 bytes, int's are 4). */ | ||||
| #ifndef DES_LONG | ||||
| #define DES_LONG unsigned long | ||||
| #endif | ||||
|  | ||||
| typedef unsigned char des_cblock[8]; | ||||
| typedef struct des_ks_struct | ||||
| 	{ | ||||
| @@ -57,7 +63,7 @@ typedef struct des_ks_struct | ||||
| 		des_cblock _; | ||||
| 		/* make sure things are correct size on machines with | ||||
| 		 * 8 byte longs */ | ||||
| 		unsigned long pad[2]; | ||||
| 		DES_LONG pad[2]; | ||||
| 		} ks; | ||||
| #undef _ | ||||
| #define _	ks._ | ||||
| @@ -102,7 +108,7 @@ typedef struct des_ks_struct | ||||
| #define quad_cksum des_quad_cksum | ||||
|  | ||||
| /* For compatibility with the MIT lib - eay 20/05/92 */ | ||||
| typedef struct des_key_schedule bit_64; | ||||
| typedef des_key_schedule bit_64; | ||||
| #define des_fixup_key_parity des_set_odd_parity | ||||
| #define des_check_key_parity check_parity | ||||
|  | ||||
| @@ -113,14 +119,13 @@ extern int des_rw_mode;		/* defaults to DES_PCBC_MODE */ | ||||
|  * compiler has problems with the prototypes, make sure this line always | ||||
|  * evaluates to true :-) */ | ||||
| #if defined(MSDOS) || defined(__STDC__) | ||||
| #undef PROTO | ||||
| #define PROTO | ||||
| #undef NOPROTO | ||||
| #endif | ||||
| #ifdef PROTO | ||||
| #ifndef NOPROTO | ||||
| void des_ecb3_encrypt(des_cblock *input,des_cblock *output, | ||||
| 	des_key_schedule ks1,des_key_schedule ks2, | ||||
| 	des_key_schedule ks3, int enc); | ||||
| unsigned long des_cbc_cksum(des_cblock *input,des_cblock *output, | ||||
| DES_LONG des_cbc_cksum(des_cblock *input,des_cblock *output, | ||||
| 	long length,des_key_schedule schedule,des_cblock *ivec); | ||||
| void des_cbc_encrypt(des_cblock *input,des_cblock *output,long length, | ||||
| 	des_key_schedule schedule,des_cblock *ivec,int enc); | ||||
| @@ -133,8 +138,8 @@ void des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits, | ||||
| 	long length,des_key_schedule schedule,des_cblock *ivec,int enc); | ||||
| void des_ecb_encrypt(des_cblock *input,des_cblock *output, | ||||
| 	des_key_schedule ks,int enc); | ||||
| void des_encrypt(unsigned long *data,des_key_schedule ks, int enc); | ||||
| void des_encrypt2(unsigned long *data,des_key_schedule ks, int enc); | ||||
| void des_encrypt(DES_LONG *data,des_key_schedule ks, int enc); | ||||
| void des_encrypt2(DES_LONG *data,des_key_schedule ks, int enc); | ||||
| void 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); | ||||
| @@ -164,7 +169,7 @@ void des_ofb_encrypt(unsigned char *in,unsigned char *out, | ||||
| 	int numbits,long length,des_key_schedule schedule,des_cblock *ivec); | ||||
| void des_pcbc_encrypt(des_cblock *input,des_cblock *output,long length, | ||||
| 	des_key_schedule schedule,des_cblock *ivec,int enc); | ||||
| unsigned long des_quad_cksum(des_cblock *input,des_cblock *output, | ||||
| DES_LONG des_quad_cksum(des_cblock *input,des_cblock *output, | ||||
| 	long length,int out_count,des_cblock *seed); | ||||
| void des_random_seed(des_cblock key); | ||||
| void des_random_key(des_cblock ret); | ||||
| @@ -197,7 +202,7 @@ void des_generate_random_block(des_cblock *block); | ||||
| #else | ||||
|  | ||||
| void des_ecb3_encrypt(); | ||||
| unsigned long des_cbc_cksum(); | ||||
| DES_LONG des_cbc_cksum(); | ||||
| void des_cbc_encrypt(); | ||||
| void des_ncbc_encrypt(); | ||||
| void des_3cbc_encrypt(); | ||||
| @@ -217,7 +222,7 @@ char *crypt(); | ||||
| #endif | ||||
| void des_ofb_encrypt(); | ||||
| void des_pcbc_encrypt(); | ||||
| unsigned long des_quad_cksum(); | ||||
| DES_LONG des_quad_cksum(); | ||||
| void des_random_seed(); | ||||
| void des_random_key(); | ||||
| int des_read_password(); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Björn Groenvall
					Björn Groenvall