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

add autoconf support for chapoly-aead, wipe temp polykey, minor whitespace adjusts

Browse Source
This commit is contained in:
toddouska
2015-02-24 12:33:52 -08:00
parent 0e5f879d0b
commit 9d20e712bf
11 changed files with 301 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -6,7 +6,7 @@
# #
# #
AC_INIT([wolfssl],[3.4.0],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[http://www.wolfssl.com]) AC_INIT([wolfssl],[3.4.1],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[http://www.wolfssl.com])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])

3
src/include.am
View File

@@ -146,6 +146,9 @@ endif
if BUILD_CHACHA if BUILD_CHACHA
src_libwolfssl_la_SOURCES += wolfcrypt/src/chacha.c src_libwolfssl_la_SOURCES += wolfcrypt/src/chacha.c
if BUILD_POLY1305
src_libwolfssl_la_SOURCES += wolfcrypt/src/chacha20_poly1305.c
endif
endif endif
if !BUILD_INLINE if !BUILD_INLINE

2
support/wolfssl.pc
View File

@@ -5,6 +5,6 @@ includedir=${prefix}/include
Name: wolfssl Name: wolfssl
Description: wolfssl C library. Description: wolfssl C library.
Version: 3.4.0 Version: 3.4.1
Libs: -L${libdir} -lwolfssl Libs: -L${libdir} -lwolfssl
Cflags: -I${includedir} Cflags: -I${includedir}

26
wolfcrypt/benchmark/benchmark.c
View File

@@ -285,6 +285,9 @@ int benchmark_test(void *args)
#ifdef HAVE_CHACHA #ifdef HAVE_CHACHA
bench_chacha(); bench_chacha();
#endif #endif
#if defined(HAVE_CHACHA) && defined(HAVE_POLY1305)
bench_chacha20_poly1305_aead();
#endif
#ifndef NO_DES3 #ifndef NO_DES3
bench_des(); bench_des();
#endif #endif
@@ -297,9 +300,6 @@ int benchmark_test(void *args)
#ifdef HAVE_POLY1305 #ifdef HAVE_POLY1305
bench_poly1305(); bench_poly1305();
#endif #endif
#if( defined( HAVE_CHACHA ) && defined( HAVE_POLY1305 ) )
bench_chacha20_poly1305_aead();
#endif
#ifndef NO_SHA #ifndef NO_SHA
bench_sha(); bench_sha();
#endif #endif
@@ -775,24 +775,25 @@ void bench_chacha(void)
} }
#endif /* HAVE_CHACHA*/ #endif /* HAVE_CHACHA*/
#if( defined( HAVE_CHACHA ) && defined( HAVE_POLY1305 ) ) #if( defined( HAVE_CHACHA ) && defined( HAVE_POLY1305 ) )
void bench_chacha20_poly1305_aead(void) void bench_chacha20_poly1305_aead(void)
{ {
double start, total, persec; double start, total, persec;
int i; int i;
byte authTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE]; byte authTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE];
XMEMSET( authTag, 0, sizeof( authTag ) ); XMEMSET( authTag, 0, sizeof( authTag ) );
start = current_time(1); start = current_time(1);
BEGIN_INTEL_CYCLES BEGIN_INTEL_CYCLES
for (i = 0; i < numBlocks; i++) for (i = 0; i < numBlocks; i++)
{ {
wc_ChaCha20Poly1305_Encrypt( key, iv, NULL, 0, plain, sizeof( plain ), cipher, authTag ); wc_ChaCha20Poly1305_Encrypt(key, iv, NULL, 0, plain, sizeof(plain),
cipher, authTag );
} }
END_INTEL_CYCLES END_INTEL_CYCLES
total = current_time(0) - start; total = current_time(0) - start;
persec = 1 / total * numBlocks; persec = 1 / total * numBlocks;
@@ -800,11 +801,12 @@ void bench_chacha20_poly1305_aead(void)
/* since using kB, convert to MB/s */ /* since using kB, convert to MB/s */
persec = persec / 1024; persec = persec / 1024;
#endif #endif
printf("ChaCha20-Poly1305 AEAD %d %s took %5.3f seconds, %7.3f MB/s", numBlocks, blockType, total, persec); printf("ChaCha-Poly %d %s took %5.3f seconds, %7.3f MB/s",
numBlocks, blockType, total, persec);
SHOW_INTEL_CYCLES SHOW_INTEL_CYCLES
printf("\n"); printf("\n");
} }
#endif /* HAVE_CHACHA && HAVE_POLY1305 */ #endif /* HAVE_CHACHA && HAVE_POLY1305 */

327
wolfcrypt/src/chacha20_poly1305.c
View File

@@ -21,12 +21,12 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#if( defined( HAVE_CHACHA ) && defined( HAVE_POLY1305 ) ) #if defined(HAVE_CHACHA) && defined(HAVE_POLY1305)
#include <wolfssl/wolfcrypt/chacha20_poly1305.h> #include <wolfssl/wolfcrypt/chacha20_poly1305.h>
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
@@ -47,235 +47,242 @@
#define CHACHA20_POLY1305_AEAD_INITIAL_COUNTER 0 #define CHACHA20_POLY1305_AEAD_INITIAL_COUNTER 0
#define CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT 16 #define CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT 16
static void _word32ToLittle64( const word32 inLittle32, byte outLittle64[8] ); static void word32ToLittle64(const word32 inLittle32, byte outLittle64[8]);
static int _calculateAuthTag( const byte inAuthKey[CHACHA20_POLY1305_AEAD_KEYSIZE], static int calculateAuthTag(
const byte* inAAD, const word32 inAADLen, const byte inAuthKey[CHACHA20_POLY1305_AEAD_KEYSIZE],
const byte *inCiphertext, const word32 inCiphertextLen, const byte* inAAD, const word32 inAADLen,
byte outAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE] ); const byte *inCiphertext, const word32 inCiphertextLen,
static int constantTimeCompare( const byte *a, const byte *b, word32 len ); byte outAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE]);
static int constantTimeCompare(const byte *a, const byte *b, word32 len);
WOLFSSL_API int wc_ChaCha20Poly1305_Encrypt( const byte inKey[CHACHA20_POLY1305_AEAD_KEYSIZE], int wc_ChaCha20Poly1305_Encrypt(
const byte inIV[CHACHA20_POLY1305_AEAD_IV_SIZE], const byte inKey[CHACHA20_POLY1305_AEAD_KEYSIZE],
const byte *inAAD, const word32 inAADLen, const byte inIV[CHACHA20_POLY1305_AEAD_IV_SIZE],
const byte *inPlaintext, const word32 inPlaintextLen, const byte* inAAD, const word32 inAADLen,
byte *outCiphertext, const byte* inPlaintext, const word32 inPlaintextLen,
byte outAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE] ) byte* outCiphertext,
byte outAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE])
{ {
int err; int err;
byte poly1305Key[CHACHA20_POLY1305_AEAD_KEYSIZE]; byte poly1305Key[CHACHA20_POLY1305_AEAD_KEYSIZE];
ChaCha chaChaCtx; ChaCha chaChaCtx;
// Validate function arguments /* Validate function arguments */
if( !inKey || !inIV || if (!inKey || !inIV ||
!inPlaintext || !inPlaintextLen || !inPlaintext || !inPlaintextLen ||
!outCiphertext || !outCiphertext ||
!outAuthTag ) !outAuthTag)
{ {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
ForceZero( poly1305Key, sizeof( poly1305Key ) ); XMEMSET(poly1305Key, 0, sizeof(poly1305Key));
err = 0; /* Create the Poly1305 key */
err = wc_Chacha_SetKey(&chaChaCtx, inKey, CHACHA20_POLY1305_AEAD_KEYSIZE);
// Create the Poly1305 key if (err != 0) return err;
err += wc_Chacha_SetKey( &chaChaCtx, inKey, CHACHA20_POLY1305_AEAD_KEYSIZE ); err = wc_Chacha_SetIV(&chaChaCtx, inIV,
err += wc_Chacha_SetIV( &chaChaCtx, inIV, CHACHA20_POLY1305_AEAD_INITIAL_COUNTER ); CHACHA20_POLY1305_AEAD_INITIAL_COUNTER);
err += wc_Chacha_Process( &chaChaCtx, poly1305Key, poly1305Key, CHACHA20_POLY1305_AEAD_KEYSIZE ); if (err != 0) return err;
if( err )
{ err = wc_Chacha_Process(&chaChaCtx, poly1305Key, poly1305Key,
return err; CHACHA20_POLY1305_AEAD_KEYSIZE);
} if (err != 0) return err;
// Encrypt the plaintext using ChaCha20 /* Encrypt the plaintext using ChaCha20 */
err = wc_Chacha_Process(&chaChaCtx, outCiphertext, inPlaintext,
err = wc_Chacha_Process( &chaChaCtx, outCiphertext, inPlaintext, inPlaintextLen ); inPlaintextLen);
if( err ) /* Calculate the Poly1305 auth tag */
{ if (err == 0)
return err; err = calculateAuthTag(poly1305Key,
} inAAD, inAADLen,
outCiphertext, inPlaintextLen,
// Calculate the Poly1305 auth tag outAuthTag);
ForceZero(poly1305Key, sizeof(poly1305Key));
err = _calculateAuthTag( poly1305Key,
inAAD, inAADLen,
outCiphertext, inPlaintextLen,
outAuthTag );
return err; return err;
} }
WOLFSSL_API int wc_ChaCha20Poly1305_Decrypt( const byte inKey[CHACHA20_POLY1305_AEAD_KEYSIZE],
const byte inIV[CHACHA20_POLY1305_AEAD_IV_SIZE], int wc_ChaCha20Poly1305_Decrypt(
const byte *inAAD, const word32 inAADLen, const byte inKey[CHACHA20_POLY1305_AEAD_KEYSIZE],
const byte *inCiphertext, const word32 inCiphertextLen, const byte inIV[CHACHA20_POLY1305_AEAD_IV_SIZE],
const byte inAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE], const byte* inAAD, const word32 inAADLen,
byte* outPlaintext ) const byte* inCiphertext, const word32 inCiphertextLen,
const byte inAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE],
byte* outPlaintext)
{ {
int err; int err;
byte poly1305Key[CHACHA20_POLY1305_AEAD_KEYSIZE]; byte poly1305Key[CHACHA20_POLY1305_AEAD_KEYSIZE];
ChaCha chaChaCtx; ChaCha chaChaCtx;
byte calculatedAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE]; byte calculatedAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE];
// Validate function arguments /* Validate function arguments */
if( !inKey || !inIV || if (!inKey || !inIV ||
!inCiphertext || !inCiphertextLen || !inCiphertext || !inCiphertextLen ||
!inAuthTag || !inAuthTag ||
!outPlaintext ) !outPlaintext)
{ {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
ForceZero( calculatedAuthTag, sizeof( calculatedAuthTag ) ); XMEMSET(calculatedAuthTag, 0, sizeof(calculatedAuthTag));
ForceZero( poly1305Key, sizeof( poly1305Key ) ); XMEMSET(poly1305Key, 0, sizeof(poly1305Key));
err = 0; /* Create the Poly1305 key */
err = wc_Chacha_SetKey(&chaChaCtx, inKey, CHACHA20_POLY1305_AEAD_KEYSIZE);
// Create the Poly1305 key if (err != 0) return err;
err += wc_Chacha_SetKey( &chaChaCtx, inKey, CHACHA20_POLY1305_AEAD_KEYSIZE ); err = wc_Chacha_SetIV(&chaChaCtx, inIV,
err += wc_Chacha_SetIV( &chaChaCtx, inIV, CHACHA20_POLY1305_AEAD_INITIAL_COUNTER ); CHACHA20_POLY1305_AEAD_INITIAL_COUNTER);
err += wc_Chacha_Process( &chaChaCtx, poly1305Key, poly1305Key, CHACHA20_POLY1305_AEAD_KEYSIZE ); if (err != 0) return err;
if( err )
err = wc_Chacha_Process(&chaChaCtx, poly1305Key, poly1305Key,
CHACHA20_POLY1305_AEAD_KEYSIZE);
if (err != 0) return err;
/* Calculate the Poly1305 auth tag */
err = calculateAuthTag(poly1305Key,
inAAD, inAADLen,
inCiphertext, inCiphertextLen,
calculatedAuthTag);
/* Compare the calculated auth tag with the received one */
if (err == 0 && constantTimeCompare(inAuthTag, calculatedAuthTag,
CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE) != 0)
{ {
return err; err = MAC_CMP_FAILED_E;
} }
// Calculate the Poly1305 auth tag /* Decrypt the received ciphertext */
if (err == 0)
err = _calculateAuthTag( poly1305Key, err = wc_Chacha_Process(&chaChaCtx, outPlaintext, inCiphertext,
inAAD, inAADLen, inCiphertextLen);
inCiphertext, inCiphertextLen, ForceZero(poly1305Key, sizeof(poly1305Key));
calculatedAuthTag );
// Compare the calculated auth tag with the received one
if( constantTimeCompare( inAuthTag, calculatedAuthTag, CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE ) )
{
return MAC_CMP_FAILED_E;
}
// Decrypt the received ciphertext
err = wc_Chacha_Process( &chaChaCtx, outPlaintext, inCiphertext, inCiphertextLen );
return err; return err;
} }
static int _calculateAuthTag( const byte inAuthKey[CHACHA20_POLY1305_AEAD_KEYSIZE],
const byte *inAAD, const word32 inAADLen, static int calculateAuthTag(
const byte *inCiphertext, const word32 inCiphertextLen, const byte inAuthKey[CHACHA20_POLY1305_AEAD_KEYSIZE],
byte outAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE] ) const byte *inAAD, const word32 inAADLen,
const byte *inCiphertext, const word32 inCiphertextLen,
byte outAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE])
{ {
int err; int err;
Poly1305 poly1305Ctx; Poly1305 poly1305Ctx;
byte padding[CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1]; byte padding[CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1];
word32 paddingLen; word32 paddingLen;
byte little64[8]; byte little64[8];
ForceZero( padding, sizeof( padding ) ); XMEMSET(padding, 0, sizeof(padding));
paddingLen = 0; paddingLen = 0;
// Initialize Poly1305 /* Initialize Poly1305 */
err = wc_Poly1305SetKey( &poly1305Ctx, inAuthKey, CHACHA20_POLY1305_AEAD_KEYSIZE ); err = wc_Poly1305SetKey(&poly1305Ctx, inAuthKey,
if( err ) CHACHA20_POLY1305_AEAD_KEYSIZE);
if (err)
{ {
return err; return err;
} }
// Create the authTag by MAC'ing the following items: /* Create the authTag by MAC'ing the following items: */
// -- AAD /* -- AAD */
if( inAAD && inAADLen ) if (inAAD && inAADLen)
{ {
err = wc_Poly1305Update( &poly1305Ctx, inAAD, inAADLen ); err = wc_Poly1305Update(&poly1305Ctx, inAAD, inAADLen);
// -- padding1: pad the AAD to 16 bytes /* -- padding1: pad the AAD to 16 bytes */
paddingLen = -inAADLen & ( CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1 ); paddingLen = -inAADLen & (CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1);
if( paddingLen ) if (paddingLen)
{ {
err += wc_Poly1305Update( &poly1305Ctx, padding, paddingLen ); err += wc_Poly1305Update(&poly1305Ctx, padding, paddingLen);
} }
if( err ) if (err)
{ {
return err; return err;
} }
} }
// -- Ciphertext /* -- Ciphertext */
err = wc_Poly1305Update( &poly1305Ctx, inCiphertext, inCiphertextLen ); err = wc_Poly1305Update(&poly1305Ctx, inCiphertext, inCiphertextLen);
if( err ) if (err)
{ {
return err; return err;
} }
// -- padding2: pad the ciphertext to 16 bytes /* -- padding2: pad the ciphertext to 16 bytes */
paddingLen = -inCiphertextLen & ( CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1 ); paddingLen = -inCiphertextLen &
if( paddingLen ) (CHACHA20_POLY1305_MAC_PADDING_ALIGNMENT - 1);
if (paddingLen)
{ {
err = wc_Poly1305Update( &poly1305Ctx, padding, paddingLen ); err = wc_Poly1305Update(&poly1305Ctx, padding, paddingLen);
if( err ) if (err)
{ {
return err; return err;
} }
} }
// -- AAD length as a 64-bit little endian integer /* -- AAD length as a 64-bit little endian integer */
_word32ToLittle64( inAADLen, little64 ); word32ToLittle64(inAADLen, little64);
err = wc_Poly1305Update( &poly1305Ctx, little64, sizeof( little64 ) ); err = wc_Poly1305Update(&poly1305Ctx, little64, sizeof(little64));
if( err ) if (err)
{ {
return err; return err;
} }
// -- Ciphertext length as a 64-bit little endian integer /* -- Ciphertext length as a 64-bit little endian integer */
_word32ToLittle64( inCiphertextLen, little64 ); word32ToLittle64(inCiphertextLen, little64);
err = wc_Poly1305Update( &poly1305Ctx, little64, sizeof( little64 ) ); err = wc_Poly1305Update(&poly1305Ctx, little64, sizeof(little64));
if( err ) if (err)
{ {
return err; return err;
} }
// Finalize the auth tag /* Finalize the auth tag */
err = wc_Poly1305Final( &poly1305Ctx, outAuthTag ); err = wc_Poly1305Final(&poly1305Ctx, outAuthTag);
return err; return err;
} }
static void _word32ToLittle64( const word32 inLittle32, byte outLittle64[8] )
static void word32ToLittle64(const word32 inLittle32, byte outLittle64[8])
{ {
ForceZero( outLittle64, 8 ); XMEMSET(outLittle64, 0, 8);
outLittle64[0] = ( inLittle32 & 0x000000FF ); outLittle64[0] = (inLittle32 & 0x000000FF);
outLittle64[1] = ( inLittle32 & 0x0000FF00 ) >> 8; outLittle64[1] = (inLittle32 & 0x0000FF00) >> 8;
outLittle64[2] = ( inLittle32 & 0x00FF0000 ) >> 16; outLittle64[2] = (inLittle32 & 0x00FF0000) >> 16;
outLittle64[3] = ( inLittle32 & 0xFF000000 ) >> 24; outLittle64[3] = (inLittle32 & 0xFF000000) >> 24;
} }
static int constantTimeCompare( const byte *a, const byte *b, word32 len )
static int constantTimeCompare(const byte *a, const byte *b, word32 len)
{ {
word32 i; word32 i;
byte result = 0; byte result = 0;
for( i = 0; i < len; i++ ) for (i = 0; i < len; i++)
{ {
result |= a[i] ^ b[i]; result |= a[i] ^ b[i];
} }
return (int)result; return (int)result;
} }

3
wolfcrypt/src/error.c
View File

@@ -316,6 +316,9 @@ const char* wc_GetErrorString(int error)
case THREAD_STORE_SET_E: case THREAD_STORE_SET_E:
return "Thread Storage Set error"; return "Thread Storage Set error";
case MAC_CMP_FAILED_E:
return "MAC comparison failed";
default: default:
return "unknown error number"; return "unknown error number";

148
wolfcrypt/test/test.c
View File

@@ -2074,12 +2074,12 @@ int poly1305_test(void)
#endif /* HAVE_POLY1305 */ #endif /* HAVE_POLY1305 */
#if(defined(HAVE_CHACHA) && defined(HAVE_POLY1305)) #if defined(HAVE_CHACHA) && defined(HAVE_POLY1305)
int chacha20_poly1305_aead_test(void) int chacha20_poly1305_aead_test(void)
{ {
// Test #1 from Section 2.8.2 of draft-irtf-cfrg-chacha20-poly1305-10 /* Test #1 from Section 2.8.2 of draft-irtf-cfrg-chacha20-poly1305-10 */
// https://tools.ietf.org/html/draft-irtf-cfrg-chacha20-poly1305-10 /* https://tools.ietf.org/html/draft-irtf-cfrg-chacha20-poly1305-10 */
const byte key1[] = { const byte key1[] = {
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
@@ -2132,22 +2132,22 @@ int chacha20_poly1305_aead_test(void)
0xe5, 0x76, 0xd2, 0x65, 0x86, 0xce, 0xc6, 0x4b, 0xe5, 0x76, 0xd2, 0x65, 0x86, 0xce, 0xc6, 0x4b,
0x61, 0x16 0x61, 0x16
}; };
const byte authTag1[] = { /* expected output from operation */ const byte authTag1[] = { /* expected output from operation */
0x1a, 0xe1, 0x0b, 0x59, 0x4f, 0x09, 0xe2, 0x6a, 0x1a, 0xe1, 0x0b, 0x59, 0x4f, 0x09, 0xe2, 0x6a,
0x7e, 0x90, 0x2e, 0xcb, 0xd0, 0x60, 0x06, 0x91 0x7e, 0x90, 0x2e, 0xcb, 0xd0, 0x60, 0x06, 0x91
}; };
// Test #2 from Appendix A.2 in draft-irtf-cfrg-chacha20-poly1305-10 /* Test #2 from Appendix A.2 in draft-irtf-cfrg-chacha20-poly1305-10 */
// https://tools.ietf.org/html/draft-irtf-cfrg-chacha20-poly1305-10 /* https://tools.ietf.org/html/draft-irtf-cfrg-chacha20-poly1305-10 */
const byte key2[] = { const byte key2[] = {
0x1c, 0x92, 0x40, 0xa5, 0xeb, 0x55, 0xd3, 0x8a, 0x1c, 0x92, 0x40, 0xa5, 0xeb, 0x55, 0xd3, 0x8a,
0xf3, 0x33, 0x88, 0x86, 0x04, 0xf6, 0xb5, 0xf0, 0xf3, 0x33, 0x88, 0x86, 0x04, 0xf6, 0xb5, 0xf0,
0x47, 0x39, 0x17, 0xc1, 0x40, 0x2b, 0x80, 0x09, 0x47, 0x39, 0x17, 0xc1, 0x40, 0x2b, 0x80, 0x09,
0x9d, 0xca, 0x5c, 0xbc, 0x20, 0x70, 0x75, 0xc0 0x9d, 0xca, 0x5c, 0xbc, 0x20, 0x70, 0x75, 0xc0
}; };
const byte plaintext2[] = { const byte plaintext2[] = {
0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74,
0x2d, 0x44, 0x72, 0x61, 0x66, 0x74, 0x73, 0x20, 0x2d, 0x44, 0x72, 0x61, 0x66, 0x74, 0x73, 0x20,
@@ -2178,23 +2178,23 @@ int chacha20_poly1305_aead_test(void)
0x6c, 0x20, 0x6f, 0x72, 0x20, 0x74, 0x6f, 0x20, 0x6c, 0x20, 0x6f, 0x72, 0x20, 0x74, 0x6f, 0x20,
0x63, 0x69, 0x74, 0x65, 0x20, 0x74, 0x68, 0x65, 0x63, 0x69, 0x74, 0x65, 0x20, 0x74, 0x68, 0x65,
0x6d, 0x20, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x20, 0x6d, 0x20, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x20,
0x74, 0x68, 0x61, 0x6e, 0x20, 0x61, 0x73, 0x20, 0x74, 0x68, 0x61, 0x6e, 0x20, 0x61, 0x73, 0x20,
0x2f, 0xe2, 0x80, 0x9c, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0xe2, 0x80, 0x9c, 0x77, 0x6f, 0x72, 0x6b,
0x20, 0x69, 0x6e, 0x20, 0x70, 0x72, 0x6f, 0x67, 0x20, 0x69, 0x6e, 0x20, 0x70, 0x72, 0x6f, 0x67,
0x72, 0x65, 0x73, 0x73, 0x2e, 0x2f, 0xe2, 0x80, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x2f, 0xe2, 0x80,
0x9d 0x9d
}; };
const byte iv2[] = { const byte iv2[] = {
0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04,
0x05, 0x06, 0x07, 0x08 0x05, 0x06, 0x07, 0x08
}; };
const byte aad2[] = { /* additional data */ const byte aad2[] = { /* additional data */
0xf3, 0x33, 0x88, 0x86, 0x00, 0x00, 0x00, 0x00, 0xf3, 0x33, 0x88, 0x86, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x4e, 0x91 0x00, 0x00, 0x4e, 0x91
}; };
const byte cipher2[] = { /* expected output from operation */ const byte cipher2[] = { /* expected output from operation */
0x64, 0xa0, 0x86, 0x15, 0x75, 0x86, 0x1a, 0xf4, 0x64, 0xa0, 0x86, 0x15, 0x75, 0x86, 0x1a, 0xf4,
0x60, 0xf0, 0x62, 0xc7, 0x9b, 0xe6, 0x43, 0xbd, 0x60, 0xf0, 0x62, 0xc7, 0x9b, 0xe6, 0x43, 0xbd,
@@ -2231,103 +2231,103 @@ int chacha20_poly1305_aead_test(void)
0xa6, 0xad, 0x5c, 0xb4, 0x02, 0x2b, 0x02, 0x70, 0xa6, 0xad, 0x5c, 0xb4, 0x02, 0x2b, 0x02, 0x70,
0x9b 0x9b
}; };
const byte authTag2[] = { /* expected output from operation */ const byte authTag2[] = { /* expected output from operation */
0xee, 0xad, 0x9d, 0x67, 0x89, 0x0c, 0xbb, 0x22, 0xee, 0xad, 0x9d, 0x67, 0x89, 0x0c, 0xbb, 0x22,
0x39, 0x23, 0x36, 0xfe, 0xa1, 0x85, 0x1f, 0x38 0x39, 0x23, 0x36, 0xfe, 0xa1, 0x85, 0x1f, 0x38
}; };
byte generatedCiphertext[272]; byte generatedCiphertext[272];
byte generatedPlaintext[272]; byte generatedPlaintext[272];
byte generatedAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE]; byte generatedAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE];
int err; int err;
XMEMSET( generatedCiphertext, 0, sizeof( generatedCiphertext ) ); XMEMSET(generatedCiphertext, 0, sizeof(generatedCiphertext));
XMEMSET( generatedAuthTag, 0, sizeof( generatedAuthTag ) ); XMEMSET(generatedAuthTag, 0, sizeof(generatedAuthTag));
XMEMSET( generatedPlaintext, 0, sizeof( generatedPlaintext ) ); XMEMSET(generatedPlaintext, 0, sizeof(generatedPlaintext));
// Test #1 /* Test #1 */
err = wc_ChaCha20Poly1305_Encrypt( key1, iv1, err = wc_ChaCha20Poly1305_Encrypt(key1, iv1,
aad1, sizeof( aad1 ), aad1, sizeof(aad1),
plaintext1, sizeof( plaintext1 ), plaintext1, sizeof(plaintext1),
generatedCiphertext, generatedAuthTag ); generatedCiphertext, generatedAuthTag);
if( err ) if (err)
{ {
return err; return err;
} }
// -- Check the ciphertext and authtag /* -- Check the ciphertext and authtag */
if( XMEMCMP( generatedCiphertext, cipher1, sizeof( cipher1 ) ) ) if (XMEMCMP(generatedCiphertext, cipher1, sizeof(cipher1)))
{ {
return -1064; return -1064;
} }
if( XMEMCMP( generatedAuthTag, authTag1, sizeof( authTag1 ) ) ) if (XMEMCMP(generatedAuthTag, authTag1, sizeof(authTag1)))
{ {
return -1065; return -1065;
} }
// -- Verify decryption works /* -- Verify decryption works */
err = wc_ChaCha20Poly1305_Decrypt( key1, iv1, err = wc_ChaCha20Poly1305_Decrypt(key1, iv1,
aad1, sizeof( aad1 ), aad1, sizeof(aad1),
cipher1, sizeof( cipher1 ), cipher1, sizeof(cipher1),
authTag1, generatedPlaintext ); authTag1, generatedPlaintext);
if( err ) if (err)
{ {
return err; return err;
} }
if( XMEMCMP( generatedPlaintext, plaintext1, sizeof( plaintext1 ) ) ) if (XMEMCMP(generatedPlaintext, plaintext1, sizeof( plaintext1)))
{ {
return -1066; return -1066;
} }
XMEMSET( generatedCiphertext, 0, sizeof( generatedCiphertext ) ); XMEMSET(generatedCiphertext, 0, sizeof(generatedCiphertext));
XMEMSET( generatedAuthTag, 0, sizeof( generatedAuthTag ) ); XMEMSET(generatedAuthTag, 0, sizeof(generatedAuthTag));
XMEMSET( generatedPlaintext, 0, sizeof( generatedPlaintext ) ); XMEMSET(generatedPlaintext, 0, sizeof(generatedPlaintext));
// Test #2 /* Test #2 */
err = wc_ChaCha20Poly1305_Encrypt( key2, iv2, err = wc_ChaCha20Poly1305_Encrypt(key2, iv2,
aad2, sizeof( aad2 ), aad2, sizeof(aad2),
plaintext2, sizeof( plaintext2 ), plaintext2, sizeof(plaintext2),
generatedCiphertext, generatedAuthTag ); generatedCiphertext, generatedAuthTag);
if( err ) if (err)
{ {
return err; return err;
} }
// -- Check the ciphertext and authtag /* -- Check the ciphertext and authtag */
if( XMEMCMP( generatedCiphertext, cipher2, sizeof( cipher2 ) ) ) if (XMEMCMP(generatedCiphertext, cipher2, sizeof(cipher2)))
{ {
return -1067; return -1067;
} }
if( XMEMCMP( generatedAuthTag, authTag2, sizeof( authTag2 ) ) ) if (XMEMCMP(generatedAuthTag, authTag2, sizeof(authTag2)))
{ {
return -1068; return -1068;
} }
// -- Verify decryption works /* -- Verify decryption works */
err = wc_ChaCha20Poly1305_Decrypt( key2, iv2, err = wc_ChaCha20Poly1305_Decrypt(key2, iv2,
aad2, sizeof( aad2 ), aad2, sizeof(aad2),
cipher2, sizeof( cipher2 ), cipher2, sizeof(cipher2),
authTag2, generatedPlaintext ); authTag2, generatedPlaintext);
if( err ) if (err)
{ {
return err; return err;
} }
if( XMEMCMP( generatedPlaintext, plaintext2, sizeof( plaintext2 ) ) ) if (XMEMCMP(generatedPlaintext, plaintext2, sizeof(plaintext2)))
{ {
return -1069; return -1069;
} }
return err; return err;
} }
#endif /* HAVE_CHACHA && HAVE_POLY1305 */ #endif /* HAVE_CHACHA && HAVE_POLY1305 */

4
wolfssl/version.h
View File

@@ -26,8 +26,8 @@
extern "C" { extern "C" {
#endif #endif
#define LIBWOLFSSL_VERSION_STRING "3.4.0" #define LIBWOLFSSL_VERSION_STRING "3.4.1"
#define LIBWOLFSSL_VERSION_HEX 0x03004000 #define LIBWOLFSSL_VERSION_HEX 0x03004001
#ifdef __cplusplus #ifdef __cplusplus
} }

61
wolfssl/wolfcrypt/chacha20_poly1305.h
View File

@@ -17,13 +17,14 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
* */
* This implementation of the ChaCha20-Poly1305 AEAD is based on "ChaCha20
/* This implementation of the ChaCha20-Poly1305 AEAD is based on "ChaCha20
* and Poly1305 for IETF protocols" (draft-irtf-cfrg-chacha20-poly1305-10): * and Poly1305 for IETF protocols" (draft-irtf-cfrg-chacha20-poly1305-10):
* https://tools.ietf.org/html/draft-irtf-cfrg-chacha20-poly1305-10 * https://tools.ietf.org/html/draft-irtf-cfrg-chacha20-poly1305-10
*/ */
#if( defined( HAVE_CHACHA ) && defined( HAVE_POLY1305 ) ) #if defined(HAVE_CHACHA) && defined(HAVE_POLY1305)
#ifndef WOLF_CRYPT_CHACHA20_POLY1305_H #ifndef WOLF_CRYPT_CHACHA20_POLY1305_H
#define WOLF_CRYPT_CHACHA20_POLY1305_H #define WOLF_CRYPT_CHACHA20_POLY1305_H
@@ -31,18 +32,18 @@
#include <wolfssl/wolfcrypt/types.h> #include <wolfssl/wolfcrypt/types.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#define CHACHA20_POLY1305_AEAD_KEYSIZE 32 #define CHACHA20_POLY1305_AEAD_KEYSIZE 32
#define CHACHA20_POLY1305_AEAD_IV_SIZE 12 #define CHACHA20_POLY1305_AEAD_IV_SIZE 12
#define CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE 16 #define CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE 16
enum { enum {
CHACHA20_POLY_1305_ENC_TYPE = 8 /* cipher unique type */ CHACHA20_POLY_1305_ENC_TYPE = 8 /* cipher unique type */
}; };
/* /*
* The IV for this implementation is 96 bits to give the most flexibility. * The IV for this implementation is 96 bits to give the most flexibility.
* *
* Some protocols may have unique per-invocation inputs that are not * Some protocols may have unique per-invocation inputs that are not
@@ -51,24 +52,28 @@ extern "C" {
* transform the protocol nonce into a 96-bit nonce, for example by * transform the protocol nonce into a 96-bit nonce, for example by
* concatenating a constant value. * concatenating a constant value.
*/ */
WOLFSSL_API int wc_ChaCha20Poly1305_Encrypt(const byte inKey[CHACHA20_POLY1305_AEAD_KEYSIZE], WOLFSSL_API
const byte inIV[CHACHA20_POLY1305_AEAD_IV_SIZE], int wc_ChaCha20Poly1305_Encrypt(
const byte* inAAD, const word32 inAADLen, const byte inKey[CHACHA20_POLY1305_AEAD_KEYSIZE],
const byte* inPlaintext, const word32 inPlaintextLen, const byte inIV[CHACHA20_POLY1305_AEAD_IV_SIZE],
byte* outCiphertext, const byte* inAAD, const word32 inAADLen,
byte outAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE]); const byte* inPlaintext, const word32 inPlaintextLen,
byte* outCiphertext,
WOLFSSL_API int wc_ChaCha20Poly1305_Decrypt(const byte inKey[CHACHA20_POLY1305_AEAD_KEYSIZE], byte outAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE]);
const byte inIV[CHACHA20_POLY1305_AEAD_IV_SIZE],
const byte* inAAD, const word32 inAADLen, WOLFSSL_API
const byte* inCiphertext, const word32 inCiphertextLen, int wc_ChaCha20Poly1305_Decrypt(
const byte inAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE], const byte inKey[CHACHA20_POLY1305_AEAD_KEYSIZE],
byte* outPlaintext); const byte inIV[CHACHA20_POLY1305_AEAD_IV_SIZE],
const byte* inAAD, const word32 inAADLen,
const byte* inCiphertext, const word32 inCiphertextLen,
const byte inAuthTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE],
byte* outPlaintext);
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif
#endif /* WOLF_CRYPT_CHACHA20_POLY1305_H */ #endif /* WOLF_CRYPT_CHACHA20_POLY1305_H */
#endif /* HAVE_CHACHA && HAVE_POLY1305 */ #endif /* HAVE_CHACHA && HAVE_POLY1305 */

4
wolfssl/wolfcrypt/error-crypt.h
View File

@@ -145,9 +145,9 @@ enum {
AESGCM_KAT_FIPS_E = -210, /* AESGCM KAT failure */ AESGCM_KAT_FIPS_E = -210, /* AESGCM KAT failure */
THREAD_STORE_KEY_E = -211, /* Thread local storage key create failure */ THREAD_STORE_KEY_E = -211, /* Thread local storage key create failure */
THREAD_STORE_SET_E = -212, /* Thread local storage key set failure */ THREAD_STORE_SET_E = -212, /* Thread local storage key set failure */
MAC_CMP_FAILED_E = -213, /* MAC comparison failed */ MAC_CMP_FAILED_E = -213, /* MAC comparison failed */
MIN_CODE_E = -300 /* errors -101 - -299 */ MIN_CODE_E = -300 /* errors -101 - -299 */
}; };

1
wolfssl/wolfcrypt/include.am
View File

@@ -32,6 +32,7 @@ nobase_include_HEADERS+= \
wolfssl/wolfcrypt/pwdbased.h \ wolfssl/wolfcrypt/pwdbased.h \
wolfssl/wolfcrypt/rabbit.h \ wolfssl/wolfcrypt/rabbit.h \
wolfssl/wolfcrypt/chacha.h \ wolfssl/wolfcrypt/chacha.h \
wolfssl/wolfcrypt/chacha20_poly1305.h \
wolfssl/wolfcrypt/random.h \ wolfssl/wolfcrypt/random.h \
wolfssl/wolfcrypt/ripemd.h \ wolfssl/wolfcrypt/ripemd.h \
wolfssl/wolfcrypt/rsa.h \ wolfssl/wolfcrypt/rsa.h \