feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

brought the camellia interface to match AES's more

Browse Source
This commit is contained in:
John Safranek
2013-01-18 09:57:41 -08:00
parent d5bf944630
commit f65b0fc092
3 changed files with 61 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
ctaocrypt/src/camellia.c
View File

@ -1,6 +1,6 @@
/* aes.c /* camellia.c
* *
* Copyright (C) 2006-2012 Sawtooth Consulting Ltd. * Copyright (C) 2006-2013 Sawtooth Consulting Ltd.
* *
* This file is part of CyaSSL. * This file is part of CyaSSL.
* *
@ -34,20 +34,32 @@
#include <ctaocrypt/src/misc.c> #include <ctaocrypt/src/misc.c>
#endif #endif
#define STILL_DEVELOPING
int CamelliaSetKey(Camellia* cam, int CamelliaSetKey(Camellia* cam,
const byte* key, word32 len, const byte* iv, int dir) const byte* key, word32 len, const byte* iv, int dir)
{ {
(void)cam; (void)cam;
(void)key; (void)key;
(void)iv;
(void)dir; (void)dir;
cam->keySz = len; cam->keySz = len;
return CamelliaSetIV(cam, iv);
}
int CamelliaSetIV(Camellia* cam, const byte* iv)
{
if (cam == NULL)
return BAD_FUNC_ARG;
if (iv)
XMEMCPY(cam->reg, iv, CAMELLIA_BLOCK_SIZE);
return 0; return 0;
} }
void CamelliaEncrypt(Camellia* cam, byte* out, const byte* in, word32 sz) static void CamelliaEncrypt(Camellia* cam, byte* out, const byte* in)
{ {
const byte c1[] = const byte c1[] =
{ {
@ -67,7 +79,6 @@ void CamelliaEncrypt(Camellia* cam, byte* out, const byte* in, word32 sz)
(void)cam; (void)cam;
(void)in; (void)in;
(void)sz;
switch (cam->keySz) { switch (cam->keySz) {
case 16: case 16:
@ -83,7 +94,7 @@ void CamelliaEncrypt(Camellia* cam, byte* out, const byte* in, word32 sz)
} }
void CamelliaDecrypt(Camellia* cam, byte* out, const byte* in, word32 sz) static void CamelliaDecrypt(Camellia* cam, byte* out, const byte* in)
{ {
const byte pte[] = const byte pte[] =
{ {
@ -93,14 +104,37 @@ void CamelliaDecrypt(Camellia* cam, byte* out, const byte* in, word32 sz)
(void)cam; (void)cam;
(void)in; (void)in;
(void)sz;
XMEMCPY(out, pte, CAMELLIA_BLOCK_SIZE); XMEMCPY(out, pte, CAMELLIA_BLOCK_SIZE);
} }
void CamelliaEncryptDirect(Camellia* cam, byte* out, const byte* in)
{
CamelliaEncrypt(cam, out, in);
}
void CamelliaDecryptDirect(Camellia* cam, byte* out, const byte* in)
{
CamelliaDecrypt(cam, out, in);
}
void CamelliaCbcEncrypt(Camellia* cam, byte* out, const byte* in, word32 sz) void CamelliaCbcEncrypt(Camellia* cam, byte* out, const byte* in, word32 sz)
{ {
#ifndef STILL_DEVELOPING
word32 blocks = sz / CAMELLIA_BLOCK_SIZE;
while (blocks--) {
xorbuf((byte*)cam->reg, in, CAMELLIA_BLOCK_SIZE);
CamelliaEncrypt(cam, (byte*)cam->reg, (byte*)cam->reg);
XMEMCPY(out, cam->reg, CAMELLIA_BLOCK_SIZE);
out += CAMELLIA_BLOCK_SIZE;
in += CAMELLIA_BLOCK_SIZE;
}
#else
const byte c4[] = const byte c4[] =
{ {
0x16, 0x07, 0xCF, 0x49, 0x4B, 0x36, 0xBB, 0xF0, 0x16, 0x07, 0xCF, 0x49, 0x4B, 0x36, 0xBB, 0xF0,
@ -132,11 +166,25 @@ void CamelliaCbcEncrypt(Camellia* cam, byte* out, const byte* in, word32 sz)
XMEMCPY(out, c6, CAMELLIA_BLOCK_SIZE); XMEMCPY(out, c6, CAMELLIA_BLOCK_SIZE);
break; break;
} }
#endif
} }
void CamelliaCbcDecrypt(Camellia* cam, byte* out, const byte* in, word32 sz) void CamelliaCbcDecrypt(Camellia* cam, byte* out, const byte* in, word32 sz)
{ {
#ifndef STILL_DEVELOPING
word32 blocks = sz / CAMELLIA_BLOCK_SIZE;
while (blocks--) {
XMEMCPY(cam->tmp, in, CAMELLIA_BLOCK_SIZE);
CamelliaDecrypt(cam, (byte*)cam->tmp, out);
xorbuf(out, (byte*)cam->reg, CAMELLIA_BLOCK_SIZE);
XMEMCPY(cam->reg, cam->tmp, CAMELLIA_BLOCK_SIZE);
out += CAMELLIA_BLOCK_SIZE;
in += CAMELLIA_BLOCK_SIZE;
}
#else
const byte ptc[] = const byte ptc[] =
{ {
0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96, 0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96,
@ -148,6 +196,7 @@ void CamelliaCbcDecrypt(Camellia* cam, byte* out, const byte* in, word32 sz)
(void)sz; (void)sz;
XMEMCPY(out, ptc, CAMELLIA_BLOCK_SIZE); XMEMCPY(out, ptc, CAMELLIA_BLOCK_SIZE);
#endif
} }

6
ctaocrypt/test/test.c
View File

@ -1838,10 +1838,8 @@ int camellia_test(void)
testVectors[i].iv, CAMELLIA_DECRYPTION); testVectors[i].iv, CAMELLIA_DECRYPTION);
if (testVectors[i].type == CAM_ECB) { if (testVectors[i].type == CAM_ECB) {
CamelliaEncrypt(&enc, c, testVectors[i].plaintext, CamelliaEncryptDirect(&enc, c, testVectors[i].plaintext);
CAMELLIA_BLOCK_SIZE); CamelliaDecryptDirect(&dec, p, testVectors[i].ciphertext);
CamelliaDecrypt(&dec, p, testVectors[i].ciphertext,
CAMELLIA_BLOCK_SIZE);
} }
else { else {
CamelliaCbcEncrypt(&enc, c, testVectors[i].plaintext, CamelliaCbcEncrypt(&enc, c, testVectors[i].plaintext,

7
cyassl/ctaocrypt/camellia.h
View File

@ -48,10 +48,9 @@ typedef struct Camellia {
CYASSL_API int CamelliaSetKey(Camellia* cam, CYASSL_API int CamelliaSetKey(Camellia* cam,
const byte* key, word32 len, const byte* iv, int dir); const byte* key, word32 len, const byte* iv, int dir);
CYASSL_API void CamelliaEncrypt(Camellia* cam, CYASSL_API int CamelliaSetIV(Camellia* cam, const byte* iv);
byte* out, const byte* in, word32 sz); CYASSL_API void CamelliaEncryptDirect(Camellia* cam, byte* out, const byte* in);
CYASSL_API void CamelliaDecrypt(Camellia* cam, CYASSL_API void CamelliaDecryptDirect(Camellia* cam, byte* out, const byte* in);
byte* out, const byte* in, word32 sz);
CYASSL_API void CamelliaCbcEncrypt(Camellia* cam, CYASSL_API void CamelliaCbcEncrypt(Camellia* cam,
byte* out, const byte* in, word32 sz); byte* out, const byte* in, word32 sz);
CYASSL_API void CamelliaCbcDecrypt(Camellia* cam, CYASSL_API void CamelliaCbcDecrypt(Camellia* cam,