diff libtomcrypt/src/hashes/chc/chc.c @ 382:0cbe8f6dbf9e

propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) to branch 'au.asn.ucc.matt.dropbear' (head 02c413252c90e9de8e03d91e9939dde3029f5c0a)
author Matt Johnston <matt@ucc.asn.au>
date Thu, 11 Jan 2007 02:41:05 +0000
parents 1b9e69c058d2
children f849a5ca2efc
line wrap: on
line diff
--- a/libtomcrypt/src/hashes/chc/chc.c	Thu Jan 04 02:01:09 2007 +0000
+++ b/libtomcrypt/src/hashes/chc/chc.c	Thu Jan 11 02:41:05 2007 +0000
@@ -6,7 +6,7 @@
  * The library is free for all purposes without any express
  * guarantee it works.
  *
- * Tom St Denis, [email protected], http://libtomcrypt.org
+ * Tom St Denis, [email protected], http://libtomcrypt.com
  */
 
 #include "tomcrypt.h"
@@ -30,7 +30,8 @@
    &chc_init,
    &chc_process,
    &chc_done,
-   &chc_test
+   &chc_test,
+   NULL
 };
 
 /**
@@ -141,7 +142,7 @@
       XFREE(key);
       return err;
    }
-   memcpy(T[1], buf, cipher_blocksize);
+   XMEMCPY(T[1], buf, cipher_blocksize);
    cipher_descriptor[cipher_idx].ecb_encrypt(buf, T[0], key);
    for (x = 0; x < cipher_blocksize; x++) {
        md->chc.state[x] ^= T[0][x] ^ T[1][x];
@@ -279,7 +280,7 @@
        chc_init(&md);
        chc_process(&md, tests[x].msg, strlen((char *)tests[x].msg));
        chc_done(&md, out);
-       if (memcmp(out, tests[x].md, tests[x].len)) {
+       if (XMEMCMP(out, tests[x].md, tests[x].len)) {
           return CRYPT_FAIL_TESTVECTOR;
        }
    }
@@ -293,5 +294,5 @@
 #endif
 
 /* $Source: /cvs/libtom/libtomcrypt/src/hashes/chc/chc.c,v $ */
-/* $Revision: 1.3 $ */
-/* $Date: 2005/05/05 14:35:58 $ */
+/* $Revision: 1.6 $ */
+/* $Date: 2006/11/01 09:28:17 $ */