added libtomcrypt-1.01
This commit is contained in:
committed by
Steffen Jaeckel
parent
bfc2f5b078
commit
6ac9952498
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
#include <stdarg.h>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
@@ -62,6 +62,7 @@ int omac_done(omac_state *omac, unsigned char *out, unsigned long *outlen)
|
||||
|
||||
/* encrypt it */
|
||||
cipher_descriptor[omac->cipher_idx].ecb_encrypt(omac->block, omac->block, &omac->key);
|
||||
cipher_descriptor[omac->cipher_idx].done(&omac->key);
|
||||
|
||||
/* output it */
|
||||
for (x = 0; x < (unsigned)omac->blklen && x < *outlen; x++) {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
@@ -38,6 +38,12 @@ int omac_init(omac_state *omac, int cipher, const unsigned char *key, unsigned l
|
||||
return err;
|
||||
}
|
||||
|
||||
#ifdef LTC_FAST
|
||||
if (16 % sizeof(LTC_FAST_TYPE)) {
|
||||
return CRYPT_INVALID_ARG;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* now setup the system */
|
||||
switch (cipher_descriptor[cipher].block_length) {
|
||||
case 8: mask = 0x1B;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
#include <stdarg.h>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
@@ -40,6 +40,20 @@ int omac_process(omac_state *omac, const unsigned char *in, unsigned long inlen)
|
||||
return CRYPT_INVALID_ARG;
|
||||
}
|
||||
|
||||
#ifdef LTC_FAST
|
||||
if (omac->buflen == 0 && inlen > 16) {
|
||||
int y;
|
||||
for (x = 0; x < (inlen - 16); x += 16) {
|
||||
for (y = 0; y < 16; y += sizeof(LTC_FAST_TYPE)) {
|
||||
*((LTC_FAST_TYPE*)(&omac->prev[y])) ^= *((LTC_FAST_TYPE*)(&in[y]));
|
||||
}
|
||||
in += 16;
|
||||
cipher_descriptor[omac->cipher_idx].ecb_encrypt(omac->prev, omac->prev, &omac->key);
|
||||
}
|
||||
inlen -= x;
|
||||
}
|
||||
#endif
|
||||
|
||||
while (inlen != 0) {
|
||||
/* ok if the block is full we xor in prev, encrypt and replace prev */
|
||||
if (omac->buflen == omac->blklen) {
|
||||
@@ -53,7 +67,7 @@ int omac_process(omac_state *omac, const unsigned char *in, unsigned long inlen)
|
||||
/* add bytes */
|
||||
n = MIN(inlen, (unsigned long)(omac->blklen - omac->buflen));
|
||||
XMEMCPY(omac->block + omac->buflen, in, n);
|
||||
omac->buflen += n;
|
||||
omac->buflen += n;
|
||||
inlen -= n;
|
||||
in += n;
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
|
||||
@@ -0,0 +1,149 @@
|
||||
/* 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.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
/**
|
||||
@file pelican.c
|
||||
Pelican MAC, initialize state, by Tom St Denis
|
||||
*/
|
||||
|
||||
#ifdef PELICAN
|
||||
|
||||
#define ENCRYPT_ONLY
|
||||
#include "../../ciphers/aes/aes_tab.c"
|
||||
|
||||
|
||||
/**
|
||||
Initialize a Pelican state
|
||||
@param pelmac The Pelican state to initialize
|
||||
@param key The secret key
|
||||
@param keylen The length of the secret key (octets)
|
||||
@return CRYPT_OK if successful
|
||||
*/
|
||||
int pelican_init(pelican_state *pelmac, const unsigned char *key, unsigned long keylen)
|
||||
{
|
||||
int err;
|
||||
|
||||
LTC_ARGCHK(pelmac != NULL);
|
||||
LTC_ARGCHK(key != NULL);
|
||||
|
||||
#ifdef LTC_FAST
|
||||
if (16 % sizeof(LTC_FAST_TYPE)) {
|
||||
return CRYPT_INVALID_ARG;
|
||||
}
|
||||
#endif
|
||||
|
||||
if ((err = aes_setup(key, keylen, 0, &pelmac->K)) != CRYPT_OK) {
|
||||
return err;
|
||||
}
|
||||
|
||||
zeromem(pelmac->state, 16);
|
||||
aes_ecb_encrypt(pelmac->state, pelmac->state, &pelmac->K);
|
||||
pelmac->buflen = 0;
|
||||
|
||||
return CRYPT_OK;
|
||||
}
|
||||
|
||||
static void four_rounds(pelican_state *pelmac)
|
||||
{
|
||||
ulong32 s0, s1, s2, s3, t0, t1, t2, t3;
|
||||
int r;
|
||||
|
||||
LOAD32H(s0, pelmac->state );
|
||||
LOAD32H(s1, pelmac->state + 4);
|
||||
LOAD32H(s2, pelmac->state + 8);
|
||||
LOAD32H(s3, pelmac->state + 12);
|
||||
for (r = 0; r < 4; r++) {
|
||||
t0 =
|
||||
Te0(byte(s0, 3)) ^
|
||||
Te1(byte(s1, 2)) ^
|
||||
Te2(byte(s2, 1)) ^
|
||||
Te3(byte(s3, 0));
|
||||
t1 =
|
||||
Te0(byte(s1, 3)) ^
|
||||
Te1(byte(s2, 2)) ^
|
||||
Te2(byte(s3, 1)) ^
|
||||
Te3(byte(s0, 0));
|
||||
t2 =
|
||||
Te0(byte(s2, 3)) ^
|
||||
Te1(byte(s3, 2)) ^
|
||||
Te2(byte(s0, 1)) ^
|
||||
Te3(byte(s1, 0));
|
||||
t3 =
|
||||
Te0(byte(s3, 3)) ^
|
||||
Te1(byte(s0, 2)) ^
|
||||
Te2(byte(s1, 1)) ^
|
||||
Te3(byte(s2, 0));
|
||||
s0 = t0; s1 = t1; s2 = t2; s3 = t3;
|
||||
}
|
||||
STORE32H(s0, pelmac->state );
|
||||
STORE32H(s1, pelmac->state + 4);
|
||||
STORE32H(s2, pelmac->state + 8);
|
||||
STORE32H(s3, pelmac->state + 12);
|
||||
}
|
||||
|
||||
/**
|
||||
Process a block of text through Pelican
|
||||
@param pelmac The Pelican MAC state
|
||||
@param in The input
|
||||
@param inlen The length input (octets)
|
||||
@return CRYPT_OK on success
|
||||
*/
|
||||
int pelican_process(pelican_state *pelmac, const unsigned char *in, unsigned long inlen)
|
||||
{
|
||||
|
||||
LTC_ARGCHK(pelmac != NULL);
|
||||
LTC_ARGCHK(in != NULL);
|
||||
#ifdef LTC_FAST
|
||||
if (pelmac->buflen == 0) {
|
||||
while (inlen & ~15) {
|
||||
int x;
|
||||
for (x = 0; x < 16; x += sizeof(LTC_FAST_TYPE)) {
|
||||
*((LTC_FAST_TYPE*)((unsigned char *)pelmac->state + x)) ^= *((LTC_FAST_TYPE*)((unsigned char *)in + x));
|
||||
}
|
||||
four_rounds(pelmac);
|
||||
in += 16;
|
||||
inlen -= 16;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
while (inlen--) {
|
||||
pelmac->state[pelmac->buflen++] ^= *in++;
|
||||
if (pelmac->buflen == 16) {
|
||||
four_rounds(pelmac);
|
||||
pelmac->buflen = 0;
|
||||
}
|
||||
}
|
||||
return CRYPT_OK;
|
||||
}
|
||||
|
||||
/**
|
||||
Terminate Pelican MAC
|
||||
@param pelmac The Pelican MAC state
|
||||
@param out [out] The TAG
|
||||
@return CRYPT_OK on sucess
|
||||
*/
|
||||
int pelican_done(pelican_state *pelmac, unsigned char *out)
|
||||
{
|
||||
LTC_ARGCHK(pelmac != NULL);
|
||||
LTC_ARGCHK(out != NULL);
|
||||
if (pelmac->buflen == 16) {
|
||||
four_rounds(pelmac);
|
||||
pelmac->buflen = 0;
|
||||
}
|
||||
pelmac->state[pelmac->buflen++] ^= 0x80;
|
||||
aes_ecb_encrypt(pelmac->state, out, &pelmac->K);
|
||||
aes_done(&pelmac->K);
|
||||
return CRYPT_OK;
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,55 @@
|
||||
/* 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.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
/**
|
||||
@file pelican_memory.c
|
||||
Pelican MAC, MAC a block of memory, by Tom St Denis
|
||||
*/
|
||||
|
||||
#ifdef PELICAN
|
||||
|
||||
/**
|
||||
Pelican block of memory
|
||||
@param key The key for the MAC
|
||||
@param keylen The length of the key (octets)
|
||||
@param in The input to MAC
|
||||
@param inlen The length of the input (octets)
|
||||
@param out [out] The output TAG
|
||||
@return CRYPT_OK on success
|
||||
*/
|
||||
int pelican_memory(const unsigned char *key, unsigned long keylen,
|
||||
const unsigned char *in, unsigned long inlen,
|
||||
unsigned char *out)
|
||||
{
|
||||
pelican_state *pel;
|
||||
int err;
|
||||
|
||||
pel = XMALLOC(sizeof(*pel));
|
||||
if (pel == NULL) {
|
||||
return CRYPT_MEM;
|
||||
}
|
||||
|
||||
if ((err = pelican_init(pel, key, keylen)) != CRYPT_OK) {
|
||||
XFREE(pel);
|
||||
return err;
|
||||
}
|
||||
if ((err = pelican_process(pel, in ,inlen)) != CRYPT_OK) {
|
||||
XFREE(pel);
|
||||
return err;
|
||||
}
|
||||
err = pelican_done(pel, out);
|
||||
XFREE(pel);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,116 @@
|
||||
/* 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.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
/**
|
||||
@file pelican_test.c
|
||||
Pelican MAC, test, by Tom St Denis
|
||||
*/
|
||||
|
||||
#ifdef PELICAN
|
||||
|
||||
int pelican_test(void)
|
||||
{
|
||||
#ifndef LTC_TEST
|
||||
return CRYPT_NOP;
|
||||
#else
|
||||
static const struct {
|
||||
unsigned char K[32], MSG[64], T[16];
|
||||
int keylen, ptlen;
|
||||
} tests[] = {
|
||||
/* K=16, M=0 */
|
||||
{
|
||||
{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
|
||||
0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F },
|
||||
{ 0 },
|
||||
{ 0xeb, 0x58, 0x37, 0x15, 0xf8, 0x34, 0xde, 0xe5,
|
||||
0xa4, 0xd1, 0x6e, 0xe4, 0xb9, 0xd7, 0x76, 0x0e, },
|
||||
16, 0
|
||||
},
|
||||
|
||||
/* K=16, M=3 */
|
||||
{
|
||||
{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
|
||||
0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F },
|
||||
{ 0x00, 0x01, 0x02 },
|
||||
{ 0x1c, 0x97, 0x40, 0x60, 0x6c, 0x58, 0x17, 0x2d,
|
||||
0x03, 0x94, 0x19, 0x70, 0x81, 0xc4, 0x38, 0x54, },
|
||||
16, 3
|
||||
},
|
||||
|
||||
/* K=16, M=16 */
|
||||
{
|
||||
{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
|
||||
0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F },
|
||||
{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
|
||||
0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F },
|
||||
{ 0x03, 0xcc, 0x46, 0xb8, 0xac, 0xa7, 0x9c, 0x36,
|
||||
0x1e, 0x8c, 0x6e, 0xa6, 0x7b, 0x89, 0x32, 0x49, },
|
||||
16, 16
|
||||
},
|
||||
|
||||
/* K=16, M=32 */
|
||||
{
|
||||
{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
|
||||
0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F },
|
||||
{ 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 },
|
||||
{ 0x89, 0xcc, 0x36, 0x58, 0x1b, 0xdd, 0x4d, 0xb5,
|
||||
0x78, 0xbb, 0xac, 0xf0, 0xff, 0x8b, 0x08, 0x15, },
|
||||
16, 32
|
||||
},
|
||||
|
||||
/* K=16, M=35 */
|
||||
{
|
||||
{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
|
||||
0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F },
|
||||
{ 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,
|
||||
0x20, 0x21, 0x23 },
|
||||
{ 0x4a, 0x7d, 0x45, 0x4d, 0xcd, 0xb5, 0xda, 0x8d,
|
||||
0x48, 0x78, 0x16, 0x48, 0x5d, 0x45, 0x95, 0x99, },
|
||||
16, 35
|
||||
},
|
||||
};
|
||||
int x, err;
|
||||
unsigned char out[16];
|
||||
pelican_state pel;
|
||||
|
||||
for (x = 0; x < (int)(sizeof(tests)/sizeof(tests[0])); x++) {
|
||||
if ((err = pelican_init(&pel, tests[x].K, tests[x].keylen)) != CRYPT_OK) {
|
||||
return err;
|
||||
}
|
||||
if ((err = pelican_process(&pel, tests[x].MSG, tests[x].ptlen)) != CRYPT_OK) {
|
||||
return err;
|
||||
}
|
||||
if ((err = pelican_done(&pel, out)) != CRYPT_OK) {
|
||||
return err;
|
||||
}
|
||||
|
||||
if (memcmp(out, tests[x].T, 16)) {
|
||||
#if 0
|
||||
int y;
|
||||
printf("\nFailed test %d\n", x);
|
||||
printf("{ "); for (y = 0; y < 16; ) { printf("0x%02x, ", out[y]); if (!(++y & 7)) printf("\n"); } printf(" }\n");
|
||||
#endif
|
||||
return CRYPT_FAIL_TESTVECTOR;
|
||||
}
|
||||
}
|
||||
return CRYPT_OK;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
@@ -50,6 +50,7 @@ int pmac_done(pmac_state *state, unsigned char *out, unsigned long *outlen)
|
||||
|
||||
/* encrypt it */
|
||||
cipher_descriptor[state->cipher_idx].ecb_encrypt(state->checksum, state->checksum, &state->key);
|
||||
cipher_descriptor[state->cipher_idx].done(&state->key);
|
||||
|
||||
/* store it */
|
||||
for (x = 0; x < state->block_len && x <= (int)*outlen; x++) {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
@@ -65,7 +65,14 @@ int pmac_init(pmac_state *pmac, int cipher, const unsigned char *key, unsigned l
|
||||
}
|
||||
if (polys[poly].len != pmac->block_len) {
|
||||
return CRYPT_INVALID_ARG;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef LTC_FAST
|
||||
if (pmac->block_len % sizeof(LTC_FAST_TYPE)) {
|
||||
return CRYPT_INVALID_ARG;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/* schedule the key */
|
||||
if ((err = cipher_descriptor[cipher].setup(key, keylen, 0, &pmac->key)) != CRYPT_OK) {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
#include <stdarg.h>
|
||||
@@ -31,9 +31,9 @@
|
||||
@return CRYPT_OK if successful
|
||||
*/
|
||||
int pmac_memory_multi(int cipher,
|
||||
const unsigned char *key, unsigned long keylen,
|
||||
const unsigned char *key, unsigned long keylen,
|
||||
unsigned char *out, unsigned long *outlen,
|
||||
const unsigned char *in, unsigned long inlen, ...)
|
||||
const unsigned char *in, unsigned long inlen, ...)
|
||||
{
|
||||
int err;
|
||||
pmac_state *pmac;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
@@ -27,7 +27,8 @@
|
||||
*/
|
||||
int pmac_process(pmac_state *pmac, const unsigned char *in, unsigned long inlen)
|
||||
{
|
||||
int err, n, x;
|
||||
int err, n;
|
||||
unsigned long x;
|
||||
unsigned char Z[MAXBLOCKSIZE];
|
||||
|
||||
LTC_ARGCHK(pmac != NULL);
|
||||
@@ -41,15 +42,33 @@ int pmac_process(pmac_state *pmac, const unsigned char *in, unsigned long inlen)
|
||||
return CRYPT_INVALID_ARG;
|
||||
}
|
||||
|
||||
#ifdef LTC_FAST
|
||||
if (pmac->buflen == 0 && inlen > 16) {
|
||||
unsigned long y;
|
||||
for (x = 0; x < (inlen - 16); x += 16) {
|
||||
pmac_shift_xor(pmac);
|
||||
for (y = 0; y < 16; y += sizeof(LTC_FAST_TYPE)) {
|
||||
*((LTC_FAST_TYPE*)(&Z[y])) = *((LTC_FAST_TYPE*)(&in[y])) ^ *((LTC_FAST_TYPE*)(&pmac->Li[y]));
|
||||
}
|
||||
cipher_descriptor[pmac->cipher_idx].ecb_encrypt(Z, Z, &pmac->key);
|
||||
for (y = 0; y < 16; y += sizeof(LTC_FAST_TYPE)) {
|
||||
*((LTC_FAST_TYPE*)(&pmac->checksum[y])) ^= *((LTC_FAST_TYPE*)(&Z[y]));
|
||||
}
|
||||
in += 16;
|
||||
}
|
||||
inlen -= x;
|
||||
}
|
||||
#endif
|
||||
|
||||
while (inlen != 0) {
|
||||
/* ok if the block is full we xor in prev, encrypt and replace prev */
|
||||
if (pmac->buflen == pmac->block_len) {
|
||||
pmac_shift_xor(pmac);
|
||||
for (x = 0; x < pmac->block_len; x++) {
|
||||
Z[x] = pmac->Li[x] ^ pmac->block[x];
|
||||
for (x = 0; x < (unsigned long)pmac->block_len; x++) {
|
||||
Z[x] = pmac->Li[x] ^ pmac->block[x];
|
||||
}
|
||||
cipher_descriptor[pmac->cipher_idx].ecb_encrypt(Z, Z, &pmac->key);
|
||||
for (x = 0; x < pmac->block_len; x++) {
|
||||
for (x = 0; x < (unsigned long)pmac->block_len; x++) {
|
||||
pmac->checksum[x] ^= Z[x];
|
||||
}
|
||||
pmac->buflen = 0;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
@@ -25,9 +25,16 @@ void pmac_shift_xor(pmac_state *pmac)
|
||||
{
|
||||
int x, y;
|
||||
y = pmac_ntz(pmac->block_index++);
|
||||
#ifdef LTC_FAST
|
||||
for (x = 0; x < pmac->block_len; x += sizeof(LTC_FAST_TYPE)) {
|
||||
*((LTC_FAST_TYPE*)((unsigned char *)pmac->Li + x)) ^=
|
||||
*((LTC_FAST_TYPE*)((unsigned char *)pmac->Ls[y] + x));
|
||||
}
|
||||
#else
|
||||
for (x = 0; x < pmac->block_len; x++) {
|
||||
pmac->Li[x] ^= pmac->Ls[y][x];
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* The library is free for all purposes without any express
|
||||
* guarantee it works.
|
||||
*
|
||||
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org
|
||||
* Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org
|
||||
*/
|
||||
#include "tomcrypt.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user