From ccb2390e9c482f258ce98e61b0ef83511efcf6e3 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 3 Aug 2018 23:23:53 +0200 Subject: [PATCH] xchacha20 test: initialize the full nonce Spotted by @FiloSottile, thanks! Fixes #742 --- test/default/aead_xchacha20poly1305.c | 2 +- test/default/aead_xchacha20poly1305.exp | 102 ++++++++++++------------ 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/test/default/aead_xchacha20poly1305.c b/test/default/aead_xchacha20poly1305.c index 57734c8c..3ff62bef 100644 --- a/test/default/aead_xchacha20poly1305.c +++ b/test/default/aead_xchacha20poly1305.c @@ -24,7 +24,7 @@ tv(void) unsigned char *m = (unsigned char *) sodium_malloc(MLEN); static const unsigned char nonce[crypto_aead_xchacha20poly1305_ietf_NPUBBYTES] = { 0x07, 0x00, 0x00, 0x00, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, - 0x48, 0x49, 0x4a, 0x4b }; + 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53 }; static const unsigned char ad[ADLEN] = { 0x50, 0x51, 0x52, 0x53, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7 }; unsigned char *c = (unsigned char *) sodium_malloc(CLEN); diff --git a/test/default/aead_xchacha20poly1305.exp b/test/default/aead_xchacha20poly1305.exp index e5d73b3b..d17ee7a1 100644 --- a/test/default/aead_xchacha20poly1305.exp +++ b/test/default/aead_xchacha20poly1305.exp @@ -1,51 +1,51 @@ -,0x45,0x3c,0x06,0x93,0xa7,0x40,0x7f,0x04 -,0xff,0x4c,0x56,0xae,0xdb,0x17,0xa3,0xc0 -,0xa1,0xaf,0xff,0x01,0x17,0x49,0x30,0xfc -,0x22,0x28,0x7c,0x33,0xdb,0xcf,0x0a,0xc8 -,0xb8,0x9a,0xd9,0x29,0x53,0x0a,0x1b,0xb3 -,0xab,0x5e,0x69,0xf2,0x4c,0x7f,0x60,0x70 -,0xc8,0xf8,0x40,0xc9,0xab,0xb4,0xf6,0x9f -,0xbf,0xc8,0xa7,0xff,0x51,0x26,0xfa,0xee -,0xbb,0xb5,0x58,0x05,0xee,0x9c,0x1c,0xf2 -,0xce,0x5a,0x57,0x26,0x32,0x87,0xae,0xc5 -,0x78,0x0f,0x04,0xec,0x32,0x4c,0x35,0x14 -,0x12,0x2c,0xfc,0x32,0x31,0xfc,0x1a,0x8b -,0x71,0x8a,0x62,0x86,0x37,0x30,0xa2,0x70 -,0x2b,0xb7,0x63,0x66,0x11,0x6b,0xed,0x09 -,0xe0,0xfd,0x5c,0x6d,0x84,0xb6,0xb0,0xc1 -,0xab,0xaf,0x24,0x9d,0x5d,0xd0,0xf7,0xf5 -,0xa7,0xea -,0x45,0x3c,0x06,0x93,0xa7,0x40,0x7f,0x04 -,0xff,0x4c,0x56,0xae,0xdb,0x17,0xa3,0xc0 -,0xa1,0xaf,0xff,0x01,0x17,0x49,0x30,0xfc -,0x22,0x28,0x7c,0x33,0xdb,0xcf,0x0a,0xc8 -,0xb8,0x9a,0xd9,0x29,0x53,0x0a,0x1b,0xb3 -,0xab,0x5e,0x69,0xf2,0x4c,0x7f,0x60,0x70 -,0xc8,0xf8,0x40,0xc9,0xab,0xb4,0xf6,0x9f -,0xbf,0xc8,0xa7,0xff,0x51,0x26,0xfa,0xee -,0xbb,0xb5,0x58,0x05,0xee,0x9c,0x1c,0xf2 -,0xce,0x5a,0x57,0x26,0x32,0x87,0xae,0xc5 -,0x78,0x0f,0x04,0xec,0x32,0x4c,0x35,0x14 -,0x12,0x2c,0xfc,0x32,0x31,0xfc,0x1a,0x8b -,0x71,0x8a,0x62,0x86,0x37,0x30,0xa2,0x70 -,0x2b,0xb7,0x63,0x66,0x11,0x6b,0xed,0x09 -,0xe0,0xfd,0xd4,0xc8,0x60,0xb7,0x07,0x4b -,0xe8,0x94,0xfa,0xc9,0x69,0x73,0x99,0xbe -,0x5c,0xc1 -,0x45,0x3c,0x06,0x93,0xa7,0x40,0x7f,0x04 -,0xff,0x4c,0x56,0xae,0xdb,0x17,0xa3,0xc0 -,0xa1,0xaf,0xff,0x01,0x17,0x49,0x30,0xfc -,0x22,0x28,0x7c,0x33,0xdb,0xcf,0x0a,0xc8 -,0xb8,0x9a,0xd9,0x29,0x53,0x0a,0x1b,0xb3 -,0xab,0x5e,0x69,0xf2,0x4c,0x7f,0x60,0x70 -,0xc8,0xf8,0x40,0xc9,0xab,0xb4,0xf6,0x9f -,0xbf,0xc8,0xa7,0xff,0x51,0x26,0xfa,0xee -,0xbb,0xb5,0x58,0x05,0xee,0x9c,0x1c,0xf2 -,0xce,0x5a,0x57,0x26,0x32,0x87,0xae,0xc5 -,0x78,0x0f,0x04,0xec,0x32,0x4c,0x35,0x14 -,0x12,0x2c,0xfc,0x32,0x31,0xfc,0x1a,0x8b -,0x71,0x8a,0x62,0x86,0x37,0x30,0xa2,0x70 -,0x2b,0xb7,0x63,0x66,0x11,0x6b,0xed,0x09 -,0xe0,0xfd,0xd4,0xc8,0x60,0xb7,0x07,0x4b -,0xe8,0x94,0xfa,0xc9,0x69,0x73,0x99,0xbe -,0x5c,0xc1 +,0xf8,0xeb,0xea,0x48,0x75,0x04,0x40,0x66 +,0xfc,0x16,0x2a,0x06,0x04,0xe1,0x71,0xfe +,0xec,0xfb,0x3d,0x20,0x42,0x52,0x48,0x56 +,0x3b,0xcf,0xd5,0xa1,0x55,0xdc,0xc4,0x7b +,0xbd,0xa7,0x0b,0x86,0xe5,0xab,0x9b,0x55 +,0x00,0x2b,0xd1,0x27,0x4c,0x02,0xdb,0x35 +,0x32,0x1a,0xcd,0x7a,0xf8,0xb2,0xe2,0xd2 +,0x50,0x15,0xe1,0x36,0xb7,0x67,0x94,0x58 +,0xe9,0xf4,0x32,0x43,0xbf,0x71,0x9d,0x63 +,0x9b,0xad,0xb5,0xfe,0xac,0x03,0xf8,0x0a +,0x19,0xa9,0x6e,0xf1,0x0c,0xb1,0xd1,0x53 +,0x33,0xa8,0x37,0xb9,0x09,0x46,0xba,0x38 +,0x54,0xee,0x74,0xda,0x3f,0x25,0x85,0xef +,0xc7,0xe1,0xe1,0x70,0xe1,0x7e,0x15,0xe5 +,0x63,0xe7,0x76,0x01,0xf4,0xf8,0x5c,0xaf +,0xa8,0xe5,0x87,0x76,0x14,0xe1,0x43,0xe6 +,0x84,0x20 +,0xf8,0xeb,0xea,0x48,0x75,0x04,0x40,0x66 +,0xfc,0x16,0x2a,0x06,0x04,0xe1,0x71,0xfe +,0xec,0xfb,0x3d,0x20,0x42,0x52,0x48,0x56 +,0x3b,0xcf,0xd5,0xa1,0x55,0xdc,0xc4,0x7b +,0xbd,0xa7,0x0b,0x86,0xe5,0xab,0x9b,0x55 +,0x00,0x2b,0xd1,0x27,0x4c,0x02,0xdb,0x35 +,0x32,0x1a,0xcd,0x7a,0xf8,0xb2,0xe2,0xd2 +,0x50,0x15,0xe1,0x36,0xb7,0x67,0x94,0x58 +,0xe9,0xf4,0x32,0x43,0xbf,0x71,0x9d,0x63 +,0x9b,0xad,0xb5,0xfe,0xac,0x03,0xf8,0x0a +,0x19,0xa9,0x6e,0xf1,0x0c,0xb1,0xd1,0x53 +,0x33,0xa8,0x37,0xb9,0x09,0x46,0xba,0x38 +,0x54,0xee,0x74,0xda,0x3f,0x25,0x85,0xef +,0xc7,0xe1,0xe1,0x70,0xe1,0x7e,0x15,0xe5 +,0x63,0xe7,0xe0,0x96,0xe0,0x33,0xd9,0x1b +,0x63,0xf7,0xac,0x92,0xe9,0x97,0x2e,0x0d +,0x43,0xe5 +,0xf8,0xeb,0xea,0x48,0x75,0x04,0x40,0x66 +,0xfc,0x16,0x2a,0x06,0x04,0xe1,0x71,0xfe +,0xec,0xfb,0x3d,0x20,0x42,0x52,0x48,0x56 +,0x3b,0xcf,0xd5,0xa1,0x55,0xdc,0xc4,0x7b +,0xbd,0xa7,0x0b,0x86,0xe5,0xab,0x9b,0x55 +,0x00,0x2b,0xd1,0x27,0x4c,0x02,0xdb,0x35 +,0x32,0x1a,0xcd,0x7a,0xf8,0xb2,0xe2,0xd2 +,0x50,0x15,0xe1,0x36,0xb7,0x67,0x94,0x58 +,0xe9,0xf4,0x32,0x43,0xbf,0x71,0x9d,0x63 +,0x9b,0xad,0xb5,0xfe,0xac,0x03,0xf8,0x0a +,0x19,0xa9,0x6e,0xf1,0x0c,0xb1,0xd1,0x53 +,0x33,0xa8,0x37,0xb9,0x09,0x46,0xba,0x38 +,0x54,0xee,0x74,0xda,0x3f,0x25,0x85,0xef +,0xc7,0xe1,0xe1,0x70,0xe1,0x7e,0x15,0xe5 +,0x63,0xe7,0xe0,0x96,0xe0,0x33,0xd9,0x1b +,0x63,0xf7,0xac,0x92,0xe9,0x97,0x2e,0x0d +,0x43,0xe5