diff options
| author | gibbs <gibbs@FreeBSD.org> | 1995-09-14 04:04:24 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 1995-09-14 04:04:24 +0000 |
| commit | 52c50c3fbdcb754e110c6f1265fa23b99f12c3f2 (patch) | |
| tree | 8a379d37ae5682d2b4f9922f255d57dd579d946c /eBones | |
| parent | 659217d7b0edec3692251c1c43c534ac0b5f0a71 (diff) | |
| download | FreeBSD-src-52c50c3fbdcb754e110c6f1265fa23b99f12c3f2.zip FreeBSD-src-52c50c3fbdcb754e110c6f1265fa23b99f12c3f2.tar.gz | |
Actually install des.h. We haven't been for a while now.
Diffstat (limited to 'eBones')
| -rw-r--r-- | eBones/include/Makefile | 4 | ||||
| -rw-r--r-- | eBones/include/des.h | 20 |
2 files changed, 7 insertions, 17 deletions
diff --git a/eBones/include/Makefile b/eBones/include/Makefile index 12d8198..0e95002 100644 --- a/eBones/include/Makefile +++ b/eBones/include/Makefile @@ -1,7 +1,7 @@ # from: @(#)Makefile 5.1 (Berkeley) 6/25/90 -# $Id: Makefile,v 1.5 1995/08/25 21:25:09 mark Exp $ +# $Id: Makefile,v 1.4 1995/09/13 17:23:44 markm Exp $ -FILES= kparse.h krb.h krb_db.h +FILES= kparse.h krb.h krb_db.h des.h # mit-copyright.h kadm_err.h krb_err.h diff --git a/eBones/include/des.h b/eBones/include/des.h index e55b4ae..08bbd1a 100644 --- a/eBones/include/des.h +++ b/eBones/include/des.h @@ -12,17 +12,7 @@ #include <stdio.h> typedef unsigned char des_cblock[8]; -typedef struct des_ks_struct - { - union { - des_cblock _; - /* make sure things are correct size on machines with - * 8 byte longs */ - unsigned long pad[2]; - } ks; -#undef _ -#define _ ks._ - } des_key_schedule[16]; +typedef struct des_ks_struct { des_cblock _; } des_key_schedule[16]; #define DES_KEY_SZ (sizeof(des_cblock)) #define DES_SCHEDULE_SZ (sizeof(des_key_schedule)) @@ -51,7 +41,9 @@ typedef struct des_ks_struct #define quad_cksum des_quad_cksum /* For compatibility with the MIT lib - eay 20/05/92 */ -typedef des_key_schedule bit_64; +typedef struct des_ks_struct 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 */ @@ -71,8 +63,7 @@ extern int des_rw_mode; /* defaults to DES_PCBC_MODE */ int des_2ecb_encrypt(des_cblock *input,des_cblock *output, des_key_schedule ks1,des_key_schedule ks2,int enc); int des_3ecb_encrypt(des_cblock *input,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, int enc); unsigned long des_cbc_cksum(des_cblock *input,des_cblock *output, long length,des_key_schedule schedule,des_cblock *ivec); int des_cbc_encrypt(des_cblock *input,des_cblock *output,long length, @@ -137,7 +128,6 @@ int des_cfb64_encrypt(unsigned char *in, unsigned char *out, long length, int des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length, des_key_schedule schedule, des_cblock *ivec, int *num); void des_cblock_print_file(des_cblock *cb, FILE *fp); - #else int des_2ecb_encrypt(); |
