remove ltc encauth eax

diff --git a/Makefile b/Makefile
index ba2c95f69fd42b913068a4766c0813c1d7b939ac..fc12c2c6144c462ef52966d56914208f4455fe53 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -392,14 +392,6 @@ LTCOBJ= \
    encauth/chachapoly/chacha20poly1305_setiv.o \
    encauth/chachapoly/chacha20poly1305_setiv_rfc7905.o \
    encauth/chachapoly/chacha20poly1305_test.o \
-   encauth/eax/eax_addheader.o \
-   encauth/eax/eax_decrypt.o \
-   encauth/eax/eax_decrypt_verify_memory.o \
-   encauth/eax/eax_done.o \
-   encauth/eax/eax_encrypt.o \
-   encauth/eax/eax_encrypt_authenticate_memory.o \
-   encauth/eax/eax_init.o \
-   encauth/eax/eax_test.o \
    encauth/gcm/gcm_add_aad.o \
    encauth/gcm/gcm_add_iv.o \
    encauth/gcm/gcm_done.o \

diff --git a/libtomcrypt/src/encauth/eax/eax_addheader.c b/libtomcrypt/src/encauth/eax/eax_addheader.c
deleted file mode 100644 (file)
index 5545336..0000000
--- a/libtomcrypt/src/encauth/eax/eax_addheader.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- */
-/**
-    @file eax_addheader.c
-    EAX implementation, add meta-data, by Tom St Denis
-*/
-#include "tomcrypt.h"
-
-#ifdef LTC_EAX_MODE
-
-/**
-    add header (metadata) to the stream
-    @param eax    The current EAX state
-    @param header The header (meta-data) data you wish to add to the state
-    @param length The length of the header data
-    @return CRYPT_OK if successful
-*/
-int eax_addheader(eax_state *eax, const unsigned char *header,
-                  unsigned long length)
-{
-   LTC_ARGCHK(eax    != NULL);
-   LTC_ARGCHK(header != NULL);
-   return omac_process(&eax->headeromac, header, length);
-}
-
-#endif
-
-/* ref:         $Format:%D$ */
-/* git commit:  $Format:%H$ */
-/* commit time: $Format:%ai$ */

diff --git a/libtomcrypt/src/encauth/eax/eax_decrypt.c b/libtomcrypt/src/encauth/eax/eax_decrypt.c
deleted file mode 100644 (file)
index b140716..0000000
--- a/libtomcrypt/src/encauth/eax/eax_decrypt.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- */
-
-/**
-    @file eax_decrypt.c
-    EAX implementation, decrypt block, by Tom St Denis
-*/
-#include "tomcrypt.h"
-
-#ifdef LTC_EAX_MODE
-
-/**
-   Decrypt data with the EAX protocol
-   @param eax     The EAX state
-   @param ct      The ciphertext
-   @param pt      [out] The plaintext
-   @param length  The length (octets) of the ciphertext
-   @return CRYPT_OK if successful
-*/
-int eax_decrypt(eax_state *eax, const unsigned char *ct, unsigned char *pt,
-                unsigned long length)
-{
-   int err;
-
-   LTC_ARGCHK(eax != NULL);
-   LTC_ARGCHK(pt  != NULL);
-   LTC_ARGCHK(ct  != NULL);
-
-   /* omac ciphertext */
-   if ((err = omac_process(&eax->ctomac, ct, length)) != CRYPT_OK) {
-      return err;
-   }
-
-   /* decrypt  */
-   return ctr_decrypt(ct, pt, length, &eax->ctr);
-}
-
-#endif
-
-/* ref:         $Format:%D$ */
-/* git commit:  $Format:%H$ */
-/* commit time: $Format:%ai$ */

diff --git a/libtomcrypt/src/encauth/eax/eax_decrypt_verify_memory.c b/libtomcrypt/src/encauth/eax/eax_decrypt_verify_memory.c
deleted file mode 100644 (file)
index 8c6540f..0000000
--- a/libtomcrypt/src/encauth/eax/eax_decrypt_verify_memory.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- */
-
-/**
-    @file eax_decrypt_verify_memory.c
-    EAX implementation, decrypt block of memory, by Tom St Denis
-*/
-#include "tomcrypt.h"
-
-#ifdef LTC_EAX_MODE
-
-/**
-   Decrypt a block of memory and verify the provided MAC tag with EAX
-   @param cipher     The index of the cipher desired
-   @param key        The secret key
-   @param keylen     The length of the key (octets)
-   @param nonce      The nonce data (use once) for the session
-   @param noncelen   The length of the nonce data.
-   @param header     The session header data
-   @param headerlen  The length of the header (octets)
-   @param ct         The ciphertext
-   @param ctlen      The length of the ciphertext (octets)
-   @param pt         [out] The plaintext
-   @param tag        The authentication tag provided by the encoder
-   @param taglen     [in/out] The length of the tag (octets)
-   @param stat       [out] The result of the decryption (1==valid tag, 0==invalid)
-   @return CRYPT_OK if successful regardless of the resulting tag comparison
-*/
-int eax_decrypt_verify_memory(int cipher,
-    const unsigned char *key,    unsigned long keylen,
-    const unsigned char *nonce,  unsigned long noncelen,
-    const unsigned char *header, unsigned long headerlen,
-    const unsigned char *ct,     unsigned long ctlen,
-          unsigned char *pt,
-          unsigned char *tag,    unsigned long taglen,
-          int           *stat)
-{
-   int            err;
-   eax_state     *eax;
-   unsigned char *buf;
-   unsigned long  buflen;
-
-   LTC_ARGCHK(stat != NULL);
-   LTC_ARGCHK(key  != NULL);
-   LTC_ARGCHK(pt   != NULL);
-   LTC_ARGCHK(ct   != NULL);
-   LTC_ARGCHK(tag  != NULL);
-
-   /* default to zero */
-   *stat = 0;
-
-   /* limit taglen */
-   taglen = MIN(taglen, MAXBLOCKSIZE);
-
-   /* allocate ram */
-   buf = XMALLOC(taglen);
-   eax = XMALLOC(sizeof(*eax));
-   if (eax == NULL || buf == NULL) {
-      if (eax != NULL) {
-         XFREE(eax);
-      }
-      if (buf != NULL) {
-         XFREE(buf);
-      }
-      return CRYPT_MEM;
-   }
-
-   if ((err = eax_init(eax, cipher, key, keylen, nonce, noncelen, header, headerlen)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   if ((err = eax_decrypt(eax, ct, pt, ctlen)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   buflen = taglen;
-   if ((err = eax_done(eax, buf, &buflen)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   /* compare tags */
-   if (buflen >= taglen && XMEM_NEQ(buf, tag, taglen) == 0) {
-      *stat = 1;
-   }
-
-   err = CRYPT_OK;
-LBL_ERR:
-#ifdef LTC_CLEAN_STACK
-   zeromem(buf, taglen);
-   zeromem(eax, sizeof(*eax));
-#endif
-
-   XFREE(eax);
-   XFREE(buf);
-
-   return err;
-}
-
-#endif
-
-/* ref:         $Format:%D$ */
-/* git commit:  $Format:%H$ */
-/* commit time: $Format:%ai$ */

diff --git a/libtomcrypt/src/encauth/eax/eax_done.c b/libtomcrypt/src/encauth/eax/eax_done.c
deleted file mode 100644 (file)
index b00bfe0..0000000
--- a/libtomcrypt/src/encauth/eax/eax_done.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- */
-
-/**
-   @file eax_done.c
-   EAX implementation, terminate session, by Tom St Denis
-*/
-#include "tomcrypt.h"
-
-#ifdef LTC_EAX_MODE
-
-/**
-   Terminate an EAX session and get the tag.
-   @param eax       The EAX state
-   @param tag       [out] The destination of the authentication tag
-   @param taglen    [in/out] The max length and resulting length of the authentication tag
-   @return CRYPT_OK if successful
-*/
-int eax_done(eax_state *eax, unsigned char *tag, unsigned long *taglen)
-{
-   int           err;
-   unsigned char *headermac, *ctmac;
-   unsigned long x, len;
-
-   LTC_ARGCHK(eax    != NULL);
-   LTC_ARGCHK(tag    != NULL);
-   LTC_ARGCHK(taglen != NULL);
-
-   /* allocate ram */
-   headermac = XMALLOC(MAXBLOCKSIZE);
-   ctmac     = XMALLOC(MAXBLOCKSIZE);
-
-   if (headermac == NULL || ctmac == NULL) {
-      if (headermac != NULL) {
-         XFREE(headermac);
-      }
-      if (ctmac != NULL) {
-         XFREE(ctmac);
-      }
-      return CRYPT_MEM;
-   }
-
-   /* finish ctomac */
-   len = MAXBLOCKSIZE;
-   if ((err = omac_done(&eax->ctomac, ctmac, &len)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   /* finish headeromac */
-
-   /* note we specifically don't reset len so the two lens are minimal */
-
-   if ((err = omac_done(&eax->headeromac, headermac, &len)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   /* terminate the CTR chain */
-   if ((err = ctr_done(&eax->ctr)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   /* compute N xor H xor C */
-   for (x = 0; x < len && x < *taglen; x++) {
-       tag[x] = eax->N[x] ^ headermac[x] ^ ctmac[x];
-   }
-   *taglen = x;
-
-   err = CRYPT_OK;
-LBL_ERR:
-#ifdef LTC_CLEAN_STACK
-   zeromem(ctmac,     MAXBLOCKSIZE);
-   zeromem(headermac, MAXBLOCKSIZE);
-   zeromem(eax,       sizeof(*eax));
-#endif
-
-   XFREE(ctmac);
-   XFREE(headermac);
-
-   return err;
-}
-
-#endif
-
-/* ref:         $Format:%D$ */
-/* git commit:  $Format:%H$ */
-/* commit time: $Format:%ai$ */

diff --git a/libtomcrypt/src/encauth/eax/eax_encrypt.c b/libtomcrypt/src/encauth/eax/eax_encrypt.c
deleted file mode 100644 (file)
index 174f263..0000000
--- a/libtomcrypt/src/encauth/eax/eax_encrypt.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- */
-
-/**
-   @file eax_encrypt.c
-   EAX implementation, encrypt block by Tom St Denis
-*/
-#include "tomcrypt.h"
-
-#ifdef LTC_EAX_MODE
-
-/**
-   Encrypt with EAX a block of data.
-   @param eax        The EAX state
-   @param pt         The plaintext to encrypt
-   @param ct         [out] The ciphertext as encrypted
-   @param length     The length of the plaintext (octets)
-   @return CRYPT_OK if successful
-*/
-int eax_encrypt(eax_state *eax, const unsigned char *pt, unsigned char *ct,
-                unsigned long length)
-{
-   int err;
-
-   LTC_ARGCHK(eax != NULL);
-   LTC_ARGCHK(pt  != NULL);
-   LTC_ARGCHK(ct  != NULL);
-
-   /* encrypt */
-   if ((err = ctr_encrypt(pt, ct, length, &eax->ctr)) != CRYPT_OK) {
-      return err;
-   }
-
-   /* omac ciphertext */
-   return omac_process(&eax->ctomac, ct, length);
-}
-
-#endif
-
-
-/* ref:         $Format:%D$ */
-/* git commit:  $Format:%H$ */
-/* commit time: $Format:%ai$ */

diff --git a/libtomcrypt/src/encauth/eax/eax_encrypt_authenticate_memory.c b/libtomcrypt/src/encauth/eax/eax_encrypt_authenticate_memory.c
deleted file mode 100644 (file)
index 9980fc0..0000000
--- a/libtomcrypt/src/encauth/eax/eax_encrypt_authenticate_memory.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- */
-
-/**
-  @file eax_encrypt_authenticate_memory.c
-  EAX implementation, encrypt a block of memory, by Tom St Denis
-*/
-#include "tomcrypt.h"
-
-#ifdef LTC_EAX_MODE
-
-/**
-   EAX encrypt and produce an authentication tag
-   @param cipher     The index of the cipher desired
-   @param key        The secret key to use
-   @param keylen     The length of the secret key (octets)
-   @param nonce      The session nonce [use once]
-   @param noncelen   The length of the nonce
-   @param header     The header for the session
-   @param headerlen  The length of the header (octets)
-   @param pt         The plaintext
-   @param ptlen      The length of the plaintext (octets)
-   @param ct         [out] The ciphertext
-   @param tag        [out] The destination tag
-   @param taglen     [in/out] The max size and resulting size of the authentication tag
-   @return CRYPT_OK if successful
-*/
-int eax_encrypt_authenticate_memory(int cipher,
-    const unsigned char *key,    unsigned long keylen,
-    const unsigned char *nonce,  unsigned long noncelen,
-    const unsigned char *header, unsigned long headerlen,
-    const unsigned char *pt,     unsigned long ptlen,
-          unsigned char *ct,
-          unsigned char *tag,    unsigned long *taglen)
-{
-   int err;
-   eax_state *eax;
-
-   LTC_ARGCHK(key    != NULL);
-   LTC_ARGCHK(pt     != NULL);
-   LTC_ARGCHK(ct     != NULL);
-   LTC_ARGCHK(tag    != NULL);
-   LTC_ARGCHK(taglen != NULL);
-
-   eax = XMALLOC(sizeof(*eax));
-
-   if ((err = eax_init(eax, cipher, key, keylen, nonce, noncelen, header, headerlen)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   if ((err = eax_encrypt(eax, pt, ct, ptlen)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   if ((err = eax_done(eax, tag, taglen)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   err = CRYPT_OK;
-LBL_ERR:
-#ifdef LTC_CLEAN_STACK
-   zeromem(eax, sizeof(*eax));
-#endif
-
-   XFREE(eax);
-
-   return err;
-}
-
-#endif
-
-/* ref:         $Format:%D$ */
-/* git commit:  $Format:%H$ */
-/* commit time: $Format:%ai$ */

diff --git a/libtomcrypt/src/encauth/eax/eax_init.c b/libtomcrypt/src/encauth/eax/eax_init.c
deleted file mode 100644 (file)
index 154d7a9..0000000
--- a/libtomcrypt/src/encauth/eax/eax_init.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- */
-
-/**
-   @file eax_init.c
-   EAX implementation, initialized EAX state, by Tom St Denis
-*/
-#include "tomcrypt.h"
-
-#ifdef LTC_EAX_MODE
-
-/**
-   Initialized an EAX state
-   @param eax       [out] The EAX state to initialize
-   @param cipher    The index of the desired cipher
-   @param key       The secret key
-   @param keylen    The length of the secret key (octets)
-   @param nonce     The use-once nonce for the session
-   @param noncelen  The length of the nonce (octets)
-   @param header    The header for the EAX state
-   @param headerlen The header length (octets)
-   @return CRYPT_OK if successful
-*/
-int eax_init(eax_state *eax, int cipher,
-             const unsigned char *key,    unsigned long keylen,
-             const unsigned char *nonce,  unsigned long noncelen,
-             const unsigned char *header, unsigned long headerlen)
-{
-   unsigned char *buf;
-   int           err, blklen;
-   omac_state    *omac;
-   unsigned long len;
-
-
-   LTC_ARGCHK(eax   != NULL);
-   LTC_ARGCHK(key   != NULL);
-   LTC_ARGCHK(nonce != NULL);
-   if (headerlen > 0) {
-      LTC_ARGCHK(header != NULL);
-   }
-
-   if ((err = cipher_is_valid(cipher)) != CRYPT_OK) {
-      return err;
-   }
-   blklen = cipher_descriptor[cipher].block_length;
-
-   /* allocate ram */
-   buf  = XMALLOC(MAXBLOCKSIZE);
-   omac = XMALLOC(sizeof(*omac));
-
-   if (buf == NULL || omac == NULL) {
-      if (buf != NULL) {
-         XFREE(buf);
-      }
-      if (omac != NULL) {
-         XFREE(omac);
-      }
-      return CRYPT_MEM;
-   }
-
-   /* N = LTC_OMAC_0K(nonce) */
-   zeromem(buf, MAXBLOCKSIZE);
-   if ((err = omac_init(omac, cipher, key, keylen)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   /* omac the [0]_n */
-   if ((err = omac_process(omac, buf, blklen)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-   /* omac the nonce */
-   if ((err = omac_process(omac, nonce, noncelen)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-   /* store result */
-   len = sizeof(eax->N);
-   if ((err = omac_done(omac, eax->N, &len)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   /* H = LTC_OMAC_1K(header) */
-   zeromem(buf, MAXBLOCKSIZE);
-   buf[blklen - 1] = 1;
-
-   if ((err = omac_init(&eax->headeromac, cipher, key, keylen)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   /* omac the [1]_n */
-   if ((err = omac_process(&eax->headeromac, buf, blklen)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-   /* omac the header */
-   if (headerlen != 0) {
-      if ((err = omac_process(&eax->headeromac, header, headerlen)) != CRYPT_OK) {
-          goto LBL_ERR;
-      }
-   }
-
-   /* note we don't finish the headeromac, this allows us to add more header later */
-
-   /* setup the CTR mode */
-   if ((err = ctr_start(cipher, eax->N, key, keylen, 0, CTR_COUNTER_BIG_ENDIAN, &eax->ctr)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   /* setup the LTC_OMAC for the ciphertext */
-   if ((err = omac_init(&eax->ctomac, cipher, key, keylen)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   /* omac [2]_n */
-   zeromem(buf, MAXBLOCKSIZE);
-   buf[blklen-1] = 2;
-   if ((err = omac_process(&eax->ctomac, buf, blklen)) != CRYPT_OK) {
-      goto LBL_ERR;
-   }
-
-   err = CRYPT_OK;
-LBL_ERR:
-#ifdef LTC_CLEAN_STACK
-   zeromem(buf,  MAXBLOCKSIZE);
-   zeromem(omac, sizeof(*omac));
-#endif
-
-   XFREE(omac);
-   XFREE(buf);
-
-   return err;
-}
-
-#endif
-
-/* ref:         $Format:%D$ */
-/* git commit:  $Format:%H$ */
-/* commit time: $Format:%ai$ */

diff --git a/libtomcrypt/src/encauth/eax/eax_test.c b/libtomcrypt/src/encauth/eax/eax_test.c
deleted file mode 100644 (file)
index 7d29ee7..0000000
--- a/libtomcrypt/src/encauth/eax/eax_test.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/* LibTomCrypt, modular cryptographic library -- Tom St Denis
- *
- * LibTomCrypt is a library that provides various cryptographic
- * algorithms in a highly modular and flexible manner.
- *
- * The library is free for all purposes without any express
- * guarantee it works.
- */
-
-/**
-    @file eax_test.c
-    EAX implementation, self-test, by Tom St Denis
-*/
-#include "tomcrypt.h"
-
-#ifdef LTC_EAX_MODE
-
-/**
-   Test the EAX implementation
-   @return CRYPT_OK if successful, CRYPT_NOP if self-testing has been disabled
-*/
-int eax_test(void)
-{
-#ifndef LTC_TEST
-   return CRYPT_NOP;
-#else
-   static const struct {
-       int               keylen,
-                       noncelen,
-                      headerlen,
-                         msglen;
-
-       unsigned char        key[MAXBLOCKSIZE],
-                          nonce[MAXBLOCKSIZE],
-                         header[MAXBLOCKSIZE],
-                      plaintext[MAXBLOCKSIZE],
-                     ciphertext[MAXBLOCKSIZE],
-                            tag[MAXBLOCKSIZE];
-   } tests[] = {
-
-/* NULL message */
-{
-   16, 0, 0, 0,
-   /* key */
-   { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
-   /* nonce */
-   { 0 },
-   /* header */
-   { 0 },
-   /* plaintext */
-   { 0 },
-   /* ciphertext */
-   { 0 },
-   /* tag */
-   { 0x9a, 0xd0, 0x7e, 0x7d, 0xbf, 0xf3, 0x01, 0xf5,
-     0x05, 0xde, 0x59, 0x6b, 0x96, 0x15, 0xdf, 0xff }
-},
-
-/* test with nonce */
-{
-   16, 16, 0, 0,
-   /* key */
-   { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
-   /* nonce */
-   { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
-   /* header */
-   { 0 },
-   /* plaintext */
-   { 0 },
-   /* ciphertext */
-   { 0 },
-   /* tag */
-   { 0x1c, 0xe1, 0x0d, 0x3e, 0xff, 0xd4, 0xca, 0xdb,
-     0xe2, 0xe4, 0x4b, 0x58, 0xd6, 0x0a, 0xb9, 0xec }
-},
-
-/* test with header [no nonce]  */
-{
-   16, 0, 16, 0,
-   /* key */
-   { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
-   /* nonce */
-   { 0 },
-   /* header */
-   { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
-   /* plaintext */
-   { 0 },
-   /* ciphertext */
-   { 0 },
-   /* tag */
-   { 0x3a, 0x69, 0x8f, 0x7a, 0x27, 0x0e, 0x51, 0xb0,
-     0xf6, 0x5b, 0x3d, 0x3e, 0x47, 0x19, 0x3c, 0xff }
-},
-
-/* test with header + nonce + plaintext */
-{
-   16, 16, 16, 32,
-   /* key */
-   { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
-   /* nonce */
-   { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
-   /* header */
-   { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
-   /* plaintext */
-   { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-     0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f },
-   /* ciphertext */
-   { 0x29, 0xd8, 0x78, 0xd1, 0xa3, 0xbe, 0x85, 0x7b,
-     0x6f, 0xb8, 0xc8, 0xea, 0x59, 0x50, 0xa7, 0x78,
-     0x33, 0x1f, 0xbf, 0x2c, 0xcf, 0x33, 0x98, 0x6f,
-     0x35, 0xe8, 0xcf, 0x12, 0x1d, 0xcb, 0x30, 0xbc },
-   /* tag */
-   { 0x4f, 0xbe, 0x03, 0x38, 0xbe, 0x1c, 0x8c, 0x7e,
-     0x1d, 0x7a, 0xe7, 0xe4, 0x5b, 0x92, 0xc5, 0x87 }
-},
-
-/* test with header + nonce + plaintext [not even sizes!] */
-{
-   16, 15, 14, 29,
-   /* key */
-   { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
-   /* nonce */
-   { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e },
-   /* header */
-   { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d },
-   /* plaintext */
-   { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-     0x18, 0x19, 0x1a, 0x1b, 0x1c },
-   /* ciphertext */
-   { 0xdd, 0x25, 0xc7, 0x54, 0xc5, 0xb1, 0x7c, 0x59,
-     0x28, 0xb6, 0x9b, 0x73, 0x15, 0x5f, 0x7b, 0xb8,
-     0x88, 0x8f, 0xaf, 0x37, 0x09, 0x1a, 0xd9, 0x2c,
-     0x8a, 0x24, 0xdb, 0x86, 0x8b },
-   /* tag */
-   { 0x0d, 0x1a, 0x14, 0xe5, 0x22, 0x24, 0xff, 0xd2,
-     0x3a, 0x05, 0xfa, 0x02, 0xcd, 0xef, 0x52, 0xda }
-},
-
-/* Vectors from Brian Gladman */
-
-{
-   16, 16, 8, 0,
-   /* key */
-   { 0x23, 0x39, 0x52, 0xde, 0xe4, 0xd5, 0xed, 0x5f,
-     0x9b, 0x9c, 0x6d, 0x6f, 0xf8, 0x0f, 0xf4, 0x78 },
-   /* nonce */
-   { 0x62, 0xec, 0x67, 0xf9, 0xc3, 0xa4, 0xa4, 0x07,
-     0xfc, 0xb2, 0xa8, 0xc4, 0x90, 0x31, 0xa8, 0xb3 },
-   /* header */
-   { 0x6b, 0xfb, 0x91, 0x4f, 0xd0, 0x7e, 0xae, 0x6b },
-   /* PT */
-   { 0x00 },
-   /* CT */
-   { 0x00 },
-   /* tag */
-   { 0xe0, 0x37, 0x83, 0x0e, 0x83, 0x89, 0xf2, 0x7b,
-     0x02, 0x5a, 0x2d, 0x65, 0x27, 0xe7, 0x9d, 0x01 }
-},
-
-{
-   16, 16, 8, 2,
-   /* key */
-   { 0x91, 0x94, 0x5d, 0x3f, 0x4d, 0xcb, 0xee, 0x0b,
-     0xf4, 0x5e, 0xf5, 0x22, 0x55, 0xf0, 0x95, 0xa4 },
-   /* nonce */
-   { 0xbe, 0xca, 0xf0, 0x43, 0xb0, 0xa2, 0x3d, 0x84,
-     0x31, 0x94, 0xba, 0x97, 0x2c, 0x66, 0xde, 0xbd },
-   /* header */
-   { 0xfa, 0x3b, 0xfd, 0x48, 0x06, 0xeb, 0x53, 0xfa },
-   /* PT */
-   { 0xf7, 0xfb },
-   /* CT */
-   { 0x19, 0xdd },
-   /* tag */
-   { 0x5c, 0x4c, 0x93, 0x31, 0x04, 0x9d, 0x0b, 0xda,
-     0xb0, 0x27, 0x74, 0x08, 0xf6, 0x79, 0x67, 0xe5 }
-},
-
-{
-   16, 16, 8, 5,
-   /* key */
-   { 0x01, 0xf7, 0x4a, 0xd6, 0x40, 0x77, 0xf2, 0xe7,
-     0x04, 0xc0, 0xf6, 0x0a, 0xda, 0x3d, 0xd5, 0x23 },
-   /* nonce */
-   { 0x70, 0xc3, 0xdb, 0x4f, 0x0d, 0x26, 0x36, 0x84,
-     0x00, 0xa1, 0x0e, 0xd0, 0x5d, 0x2b, 0xff, 0x5e },
-   /* header */
-   { 0x23, 0x4a, 0x34, 0x63, 0xc1, 0x26, 0x4a, 0xc6 },
-   /* PT */
-   { 0x1a, 0x47, 0xcb, 0x49, 0x33 },
-   /* CT */
-   { 0xd8, 0x51, 0xd5, 0xba, 0xe0 },
-   /* Tag */
-   { 0x3a, 0x59, 0xf2, 0x38, 0xa2, 0x3e, 0x39, 0x19,
-     0x9d, 0xc9, 0x26, 0x66, 0x26, 0xc4, 0x0f, 0x80 }
-}
-
-};
-   int err, x, idx, res;
-   unsigned long len;
-   unsigned char outct[MAXBLOCKSIZE], outtag[MAXBLOCKSIZE];
-
-    /* AES can be under rijndael or aes... try to find it */
-    if ((idx = find_cipher("aes")) == -1) {
-       if ((idx = find_cipher("rijndael")) == -1) {
-          return CRYPT_NOP;
-       }
-    }
-
-    for (x = 0; x < (int)(sizeof(tests)/sizeof(tests[0])); x++) {
-        len = sizeof(outtag);
-        if ((err = eax_encrypt_authenticate_memory(idx, tests[x].key, tests[x].keylen,
-            tests[x].nonce, tests[x].noncelen, tests[x].header, tests[x].headerlen,
-            tests[x].plaintext, tests[x].msglen, outct, outtag, &len)) != CRYPT_OK) {
-           return err;
-        }
-        if (compare_testvector(outtag, len, tests[x].tag, len, "EAX Tag", x) ||
-              compare_testvector(outct, tests[x].msglen, tests[x].ciphertext, tests[x].msglen, "EAX CT", x)) {
-           return CRYPT_FAIL_TESTVECTOR;
-        }
-
-        /* test decrypt */
-        if ((err = eax_decrypt_verify_memory(idx, tests[x].key, tests[x].keylen,
-             tests[x].nonce, tests[x].noncelen, tests[x].header, tests[x].headerlen,
-             outct, tests[x].msglen, outct, outtag, len, &res)) != CRYPT_OK) {
-            return err;
-        }
-        if ((res != 1) || compare_testvector(outct, tests[x].msglen, tests[x].plaintext, tests[x].msglen, "EAX", x)) {
-#ifdef LTC_TEST_DBG
-           printf("\n\nEAX: Failure-decrypt - res = %d\n", res);
-#endif
-           return CRYPT_FAIL_TESTVECTOR;
-        }
-
-    }
-    return CRYPT_OK;
-#endif /* LTC_TEST */
-}
-
-#endif /* LTC_EAX_MODE */
-
-/* ref:         $Format:%D$ */
-/* git commit:  $Format:%H$ */
-/* commit time: $Format:%ai$ */