shishi/lib crypto.c

[shishi-commit]

CVSROOT:        /cvsroot/shishi
Module name:    shishi
Branch:         
Changes by:     Simon Josefsson <address@hidden>        03/09/19 13:05:01

Modified files:
        lib            : crypto.c 

Log message:
        Fix AES checksum length, from Nicolas Pouvesle <address@hidden>.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/lib/crypto.c.diff?tr1=1.84&tr2=1.85&r1=text&r2=text

Patches:
Index: shishi/lib/crypto.c
diff -u shishi/lib/crypto.c:1.84 shishi/lib/crypto.c:1.85
--- shishi/lib/crypto.c:1.84    Thu Sep 18 17:54:09 2003
+++ shishi/lib/crypto.c Fri Sep 19 13:05:01 2003
@@ -129,10 +129,10 @@
                 const char *in, size_t inlen,
                 char **outhash, size_t * outhashlen)
 {
-  *outhashlen = 20;
-  return shishi_hmac_sha1 (handle,
-                          shishi_key_value (key), shishi_key_length (key),
-                          in, inlen, outhash);
+  *outhashlen = shishi_checksum_cksumlen
+    (shishi_cipher_defaultcksumtype (shishi_key_type (key)));
+  return shishi_hmac_sha1 (handle, shishi_key_value (key),
+                          shishi_key_length (key), in, inlen, outhash);
 }
 
 static int
@@ -380,7 +380,8 @@
     {
       Shishi_key *privacykey = NULL, *integritykey = NULL;
       int blen = shishi_cipher_blocksize (shishi_key_type (key));
-      size_t hlen = 20;                /* XXX only works for SHA-1 */
+      size_t hlen = shishi_checksum_cksumlen
+       (shishi_cipher_defaultcksumtype (shishi_key_type (key)));
 
       res = _shishi_simplified_derivekey (handle, key, keyusage,
                                          SHISHI_DERIVEKEYMODE_PRIVACY,