diff options
| -rw-r--r-- | .cvsignore | 14 | ||||
| -rw-r--r-- | .gitignore | 14 | ||||
| -rw-r--r-- | des-compat.h | 13 |
3 files changed, 34 insertions, 7 deletions
@@ -10,8 +10,22 @@ config.status configure desdata keymap.h +nettle.aux +nettle.cp +nettle.cps +nettle.dvi +nettle.fn nettle.html nettle.info +nettle.ky +nettle.log +nettle.pg +nettle.ps +nettle.toc +nettle.tp +nettle.tps +nettle.vr +nettle.vrs parity.h rotors.h stamp-h @@ -42,8 +42,22 @@ core /configure /desdata /keymap.h +/nettle.aux +/nettle.cp +/nettle.cps +/nettle.dvi +/nettle.fn /nettle.html /nettle.info +/nettle.ky +/nettle.log +/nettle.pg +/nettle.ps +/nettle.toc +/nettle.tp +/nettle.tps +/nettle.vr +/nettle.vrs /parity.h /rotors.h /stamp-h diff --git a/des-compat.h b/des-compat.h index b25312ab..0cc16ee6 100644 --- a/des-compat.h +++ b/des-compat.h @@ -38,7 +38,7 @@ /* Some names collides with nettle, so we'll need some ugly symbol * munging */ -#define des_set_key des_compat_set_key +#define des_set_key des_key_sched enum { DES_DECRYPT = 0, DES_ENCRYPT = 1 }; @@ -46,8 +46,11 @@ void des_ecb3_encrypt(const uint8_t *src, uint8_t *dst, struct des_ctx *k1, struct des_ctx *k2, struct des_ctx *k3, int enc); -uint32_t -des_cbc_cksum(const uint8_t *src, uint8_t dst, +/* des_cbc_cksum in libdes returns a 32 bit integer, representing the + * latter half of the output block, in some byte order. For now, lets + * just hope nobody uses thet feature, and return void instead. */ +void +des_cbc_cksum(const uint8_t *src, uint8_t *dst, long length, struct des_ctx *ctx, uint8_t *iv); @@ -75,10 +78,6 @@ int des_set_odd_parity(uint8_t *key); int -des_set_key(const uint8_t *key, struct des_ctx *ctx); - -/* What's the difference between this and des_set_key */ -int des_key_sched(const uint8_t *key, struct des_ctx *ctx); int |