*** empty log message ***

Rev: src/nettle/.cvsignore:1.4
Rev: src/nettle/des-compat.h:1.6

diff --git a/.cvsignore b/.cvsignore
index 5a82f7a8ae121d80924c3d7ba894e116f32b556b..9c18daf66cb4f2b7a1641b2cfa0ab8e1d7bba881 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -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

diff --git a/.gitignore b/.gitignore
index d4c1a281b0770aab3bb5dae10a7883b5fe834ec2..c1a86ea6fbc6a5f734321068ed9fbfea050af3aa 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -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 b25312abb1b254d95311e165eebdba777d635b83..0cc16ee604afb4eac311dfe46c8883688ee3375c 100644 (file)
--- 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);
 
@@ -74,10 +77,6 @@ des_ede3_cbc_encrypt(const uint8_t *src, uint8_t *dst, long length,
 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);