summaryrefslogtreecommitdiffhomepage
path: root/src/mac/pelican
diff options
context:
space:
mode:
Diffstat (limited to 'src/mac/pelican')
-rw-r--r--src/mac/pelican/pelican.c8
-rw-r--r--src/mac/pelican/pelican_memory.c6
-rw-r--r--src/mac/pelican/pelican_test.c10
3 files changed, 12 insertions, 12 deletions
diff --git a/src/mac/pelican/pelican.c b/src/mac/pelican/pelican.c
index 85bf9ee..734cd38 100644
--- a/src/mac/pelican/pelican.c
+++ b/src/mac/pelican/pelican.c
@@ -6,7 +6,7 @@
* The library is free for all purposes without any express
* guarantee it works.
*
- * Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
+ * Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.com
*/
#include "tomcrypt.h"
@@ -18,9 +18,9 @@
#ifdef PELICAN
#define ENCRYPT_ONLY
+#define PELI_TAB
#include "../../ciphers/aes/aes_tab.c"
-
/**
Initialize a Pelican state
@param pelmac The Pelican state to initialize
@@ -161,5 +161,5 @@ int pelican_done(pelican_state *pelmac, unsigned char *out)
#endif
/* $Source: /cvs/libtom/libtomcrypt/src/mac/pelican/pelican.c,v $ */
-/* $Revision: 1.16 $ */
-/* $Date: 2005/05/05 14:35:59 $ */
+/* $Revision: 1.18 $ */
+/* $Date: 2006/04/02 13:19:10 $ */
diff --git a/src/mac/pelican/pelican_memory.c b/src/mac/pelican/pelican_memory.c
index 093340d..7dde843 100644
--- a/src/mac/pelican/pelican_memory.c
+++ b/src/mac/pelican/pelican_memory.c
@@ -6,7 +6,7 @@
* The library is free for all purposes without any express
* guarantee it works.
*
- * Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
+ * Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.com
*/
#include "tomcrypt.h"
@@ -55,5 +55,5 @@ int pelican_memory(const unsigned char *key, unsigned long keylen,
#endif
/* $Source: /cvs/libtom/libtomcrypt/src/mac/pelican/pelican_memory.c,v $ */
-/* $Revision: 1.5 $ */
-/* $Date: 2005/05/05 14:35:59 $ */
+/* $Revision: 1.6 $ */
+/* $Date: 2006/03/31 14:15:35 $ */
diff --git a/src/mac/pelican/pelican_test.c b/src/mac/pelican/pelican_test.c
index 06ec3f0..3cff8ec 100644
--- a/src/mac/pelican/pelican_test.c
+++ b/src/mac/pelican/pelican_test.c
@@ -6,7 +6,7 @@
* The library is free for all purposes without any express
* guarantee it works.
*
- * Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
+ * Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.com
*/
#include "tomcrypt.h"
@@ -24,7 +24,7 @@ int pelican_test(void)
#else
static const struct {
unsigned char K[32], MSG[64], T[16];
- int keylen, ptlen;
+ int keylen, ptlen;
} tests[] = {
/* K=16, M=0 */
{
@@ -99,7 +99,7 @@ int pelican_test(void)
return err;
}
- if (memcmp(out, tests[x].T, 16)) {
+ if (XMEMCMP(out, tests[x].T, 16)) {
#if 0
int y;
printf("\nFailed test %d\n", x);
@@ -116,5 +116,5 @@ int pelican_test(void)
#endif
/* $Source: /cvs/libtom/libtomcrypt/src/mac/pelican/pelican_test.c,v $ */
-/* $Revision: 1.9 $ */
-/* $Date: 2005/05/05 14:35:59 $ */
+/* $Revision: 1.12 $ */
+/* $Date: 2006/11/21 00:18:23 $ */