summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/debug.h26
-rw-r--r--test/i-128/test-ae-decrypt.c42
-rw-r--r--test/i-128/test-ae-encrypt.c42
-rw-r--r--test/i-128/traces-ae.c4
-rw-r--r--test/i-192/traces-ae.c4
-rw-r--r--test/i-256/traces-ae.c4
-rw-r--r--test/ii-128/traces-ae.c4
-rw-r--r--test/ii-192/traces-ae.c4
-rw-r--r--test/ii-256/traces-ae.c4
9 files changed, 65 insertions, 69 deletions
diff --git a/test/debug.h b/test/debug.h
index 24b7787..56cd123 100644
--- a/test/debug.h
+++ b/test/debug.h
@@ -17,9 +17,7 @@ static inline void debug_dump_lanes(const char *header, size_t len, const uint8_
fprintf(DUMP, "%*s", indent, "");
for (size_t b=0; b<8; b++)
{
- /* start with MSB */
- size_t byte_index = len-(1+line*8+b);
- fprintf(DUMP, "%*s%02x", 5, "", buf[byte_index]);
+ fprintf(DUMP, "%*s%02x", 5, "", buf[line*8+b]);
}
fprintf(DUMP, "\n");
}
@@ -30,26 +28,24 @@ static inline void debug_dump_buffer(const char *header, size_t len, const uint8
{
fprintf(DUMP, "%*s%s\n", indent, "", header);
- if (len%8 != 0)
+ for (size_t line=0; line<len/8; line++)
{
- fprintf(DUMP, "%*s", (int)(3*(8-len%8))+indent, "");
- for (size_t b=0; b<len%8; b++)
+ fprintf(DUMP, "%*s[0x%02zx] ", indent, "", line*8);
+ for (size_t b=0; b<8; b++)
{
- size_t byte_index = len-1-b;
- fprintf(DUMP, "%02x ", buf[byte_index]);
+ /* fprintf(DUMP, "[%zu / %zu => %zu]", line, b, line*8+b); */
+ fprintf(DUMP, "%02x ", buf[line*8+b]);
}
fprintf(DUMP, "\n");
}
- for (size_t line=0; line<len/8; line++)
+ size_t rest = len%8;
+ if (rest != 0)
{
- fprintf(DUMP, "%*s", indent, "");
- for (size_t b=0; b<8; b++)
+ fprintf(DUMP, "%*s[0x%02zx] ", indent, "", len-rest);
+ for (size_t b=0; b<rest; b++)
{
- /* start with MSB */
- size_t byte_index = 8*(len/8 - 1 - line) + 7-b;
- /* fprintf(DUMP, "[%zu / %zu => %zu]", line, b, byte_index); */
- fprintf(DUMP, "%02x ", buf[byte_index]);
+ fprintf(DUMP, "%02x ", buf[len-rest+b]);
}
fprintf(DUMP, "\n");
}
diff --git a/test/i-128/test-ae-decrypt.c b/test/i-128/test-ae-decrypt.c
index 0a5934a..812eda2 100644
--- a/test/i-128/test-ae-decrypt.c
+++ b/test/i-128/test-ae-decrypt.c
@@ -47,18 +47,18 @@ const vector VECTORS[] = {
},
.ciphertext_len = 64,
.ciphertext = (uint8_t[]) {
- 0xca, 0x16, 0x03, 0x71, 0x0c, 0xca, 0x10, 0x2f,
- 0xac, 0x46, 0x0c, 0xb4, 0x13, 0x2a, 0x55, 0x0d,
- 0xc0, 0x59, 0x90, 0xb7, 0xca, 0xf2, 0x17, 0x9f,
- 0x8f, 0xd6, 0x5a, 0x73, 0x49, 0x65, 0x14, 0xec,
- 0x3e, 0xf4, 0xc5, 0xd0, 0x08, 0x3d, 0x85, 0x5c,
- 0x11, 0x70, 0x42, 0x3b, 0x91, 0x61, 0xa7, 0xf2,
- 0x7a, 0xbf, 0x51, 0x2c, 0xe3, 0x88, 0xc9, 0x97,
- 0x34, 0x92, 0xed, 0xf9, 0x5b, 0xb4, 0x2a, 0x80
+ 0xa2, 0xd5, 0xa6, 0x38, 0xca, 0xcf, 0xce, 0x90,
+ 0xaf, 0xc3, 0xb8, 0x99, 0x36, 0xba, 0xf1, 0x12,
+ 0x94, 0x13, 0x87, 0xb8, 0x7e, 0x6c, 0x07, 0x48,
+ 0x25, 0x25, 0x66, 0xd8, 0xa4, 0x05, 0xc9, 0xd3,
+ 0xc0, 0xaa, 0x27, 0xc6, 0xa6, 0x67, 0x53, 0x8f,
+ 0xcc, 0xd9, 0xd3, 0xdb, 0xf5, 0xdc, 0xad, 0xa0,
+ 0x4b, 0x3e, 0x9a, 0xfb, 0x7c, 0xe9, 0x17, 0x9c,
+ 0xb8, 0x17, 0x13, 0x9f, 0x32, 0x70, 0x5c, 0x62
},
.tag = {
- 0x47, 0x5b, 0x2c, 0x0e, 0x5f, 0xcf, 0x6f, 0xc0,
- 0xab, 0x3c, 0x24, 0xc1, 0x66, 0x88, 0x83, 0x38
+ 0x04, 0xaa, 0xc8, 0x19, 0x32, 0x70, 0x32, 0x24,
+ 0xe8, 0x27, 0xb7, 0xab, 0xec, 0xd8, 0x2f, 0x6c
},
.message = (uint8_t[]) {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
@@ -95,19 +95,19 @@ const vector VECTORS[] = {
},
.ciphertext_len = 66,
.ciphertext = (uint8_t[]) {
- 0xca, 0x16, 0x03, 0x71, 0x0c, 0xca, 0x10, 0x2f,
- 0xac, 0x46, 0x0c, 0xb4, 0x13, 0x2a, 0x55, 0x0d,
- 0xc0, 0x59, 0x90, 0xb7, 0xca, 0xf2, 0x17, 0x9f,
- 0x8f, 0xd6, 0x5a, 0x73, 0x49, 0x65, 0x14, 0xec,
- 0x3e, 0xf4, 0xc5, 0xd0, 0x08, 0x3d, 0x85, 0x5c,
- 0x11, 0x70, 0x42, 0x3b, 0x91, 0x61, 0xa7, 0xf2,
- 0x7a, 0xbf, 0x51, 0x2c, 0xe3, 0x88, 0xc9, 0x97,
- 0x34, 0x92, 0xed, 0xf9, 0x5b, 0xb4, 0x2a, 0x80,
- 0x27, 0x3f
+ 0xa2, 0xd5, 0xa6, 0x38, 0xca, 0xcf, 0xce, 0x90,
+ 0xaf, 0xc3, 0xb8, 0x99, 0x36, 0xba, 0xf1, 0x12,
+ 0x94, 0x13, 0x87, 0xb8, 0x7e, 0x6c, 0x07, 0x48,
+ 0x25, 0x25, 0x66, 0xd8, 0xa4, 0x05, 0xc9, 0xd3,
+ 0xc0, 0xaa, 0x27, 0xc6, 0xa6, 0x67, 0x53, 0x8f,
+ 0xcc, 0xd9, 0xd3, 0xdb, 0xf5, 0xdc, 0xad, 0xa0,
+ 0x4b, 0x3e, 0x9a, 0xfb, 0x7c, 0xe9, 0x17, 0x9c,
+ 0xb8, 0x17, 0x13, 0x9f, 0x32, 0x70, 0x5c, 0x62,
+ 0x88, 0x5a
},
.tag = {
- 0xd4, 0xef, 0x1f, 0x11, 0x81, 0x90, 0xbe, 0xfd,
- 0x1e, 0xa7, 0x32, 0xbe, 0x63, 0xe2, 0x18, 0x90
+ 0x64, 0xa2, 0x24, 0x03, 0xc5, 0x79, 0x4f, 0xec,
+ 0xe7, 0x7d, 0xc1, 0xf6, 0xc9, 0xc6, 0x77, 0x2c
},
.message = (uint8_t[]) {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
diff --git a/test/i-128/test-ae-encrypt.c b/test/i-128/test-ae-encrypt.c
index 06f3b88..09fbb32 100644
--- a/test/i-128/test-ae-encrypt.c
+++ b/test/i-128/test-ae-encrypt.c
@@ -57,18 +57,18 @@ const vector VECTORS[] = {
0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
},
.ciphertext = (uint8_t[]) {
- 0xca, 0x16, 0x03, 0x71, 0x0c, 0xca, 0x10, 0x2f,
- 0xac, 0x46, 0x0c, 0xb4, 0x13, 0x2a, 0x55, 0x0d,
- 0xc0, 0x59, 0x90, 0xb7, 0xca, 0xf2, 0x17, 0x9f,
- 0x8f, 0xd6, 0x5a, 0x73, 0x49, 0x65, 0x14, 0xec,
- 0x3e, 0xf4, 0xc5, 0xd0, 0x08, 0x3d, 0x85, 0x5c,
- 0x11, 0x70, 0x42, 0x3b, 0x91, 0x61, 0xa7, 0xf2,
- 0x7a, 0xbf, 0x51, 0x2c, 0xe3, 0x88, 0xc9, 0x97,
- 0x34, 0x92, 0xed, 0xf9, 0x5b, 0xb4, 0x2a, 0x80
+ 0xa2, 0xd5, 0xa6, 0x38, 0xca, 0xcf, 0xce, 0x90,
+ 0xaf, 0xc3, 0xb8, 0x99, 0x36, 0xba, 0xf1, 0x12,
+ 0x94, 0x13, 0x87, 0xb8, 0x7e, 0x6c, 0x07, 0x48,
+ 0x25, 0x25, 0x66, 0xd8, 0xa4, 0x05, 0xc9, 0xd3,
+ 0xc0, 0xaa, 0x27, 0xc6, 0xa6, 0x67, 0x53, 0x8f,
+ 0xcc, 0xd9, 0xd3, 0xdb, 0xf5, 0xdc, 0xad, 0xa0,
+ 0x4b, 0x3e, 0x9a, 0xfb, 0x7c, 0xe9, 0x17, 0x9c,
+ 0xb8, 0x17, 0x13, 0x9f, 0x32, 0x70, 0x5c, 0x62
},
.tag = {
- 0x47, 0x5b, 0x2c, 0x0e, 0x5f, 0xcf, 0x6f, 0xc0,
- 0xab, 0x3c, 0x24, 0xc1, 0x66, 0x88, 0x83, 0x38
+ 0x04, 0xaa, 0xc8, 0x19, 0x32, 0x70, 0x32, 0x24,
+ 0xe8, 0x27, 0xb7, 0xab, 0xec, 0xd8, 0x2f, 0x6c
}
},
{
@@ -106,19 +106,19 @@ const vector VECTORS[] = {
0x40, 0x01
},
.ciphertext = (uint8_t[]) {
- 0xca, 0x16, 0x03, 0x71, 0x0c, 0xca, 0x10, 0x2f,
- 0xac, 0x46, 0x0c, 0xb4, 0x13, 0x2a, 0x55, 0x0d,
- 0xc0, 0x59, 0x90, 0xb7, 0xca, 0xf2, 0x17, 0x9f,
- 0x8f, 0xd6, 0x5a, 0x73, 0x49, 0x65, 0x14, 0xec,
- 0x3e, 0xf4, 0xc5, 0xd0, 0x08, 0x3d, 0x85, 0x5c,
- 0x11, 0x70, 0x42, 0x3b, 0x91, 0x61, 0xa7, 0xf2,
- 0x7a, 0xbf, 0x51, 0x2c, 0xe3, 0x88, 0xc9, 0x97,
- 0x34, 0x92, 0xed, 0xf9, 0x5b, 0xb4, 0x2a, 0x80,
- 0x27, 0x3f
+ 0xa2, 0xd5, 0xa6, 0x38, 0xca, 0xcf, 0xce, 0x90,
+ 0xaf, 0xc3, 0xb8, 0x99, 0x36, 0xba, 0xf1, 0x12,
+ 0x94, 0x13, 0x87, 0xb8, 0x7e, 0x6c, 0x07, 0x48,
+ 0x25, 0x25, 0x66, 0xd8, 0xa4, 0x05, 0xc9, 0xd3,
+ 0xc0, 0xaa, 0x27, 0xc6, 0xa6, 0x67, 0x53, 0x8f,
+ 0xcc, 0xd9, 0xd3, 0xdb, 0xf5, 0xdc, 0xad, 0xa0,
+ 0x4b, 0x3e, 0x9a, 0xfb, 0x7c, 0xe9, 0x17, 0x9c,
+ 0xb8, 0x17, 0x13, 0x9f, 0x32, 0x70, 0x5c, 0x62,
+ 0x88, 0x5a
},
.tag = {
- 0xd4, 0xef, 0x1f, 0x11, 0x81, 0x90, 0xbe, 0xfd,
- 0x1e, 0xa7, 0x32, 0xbe, 0x63, 0xe2, 0x18, 0x90
+ 0x64, 0xa2, 0x24, 0x03, 0xc5, 0x79, 0x4f, 0xec,
+ 0xe7, 0x7d, 0xc1, 0xf6, 0xc9, 0xc6, 0x77, 0x2c
}
}
};
diff --git a/test/i-128/traces-ae.c b/test/i-128/traces-ae.c
index 441ae37..a22260d 100644
--- a/test/i-128/traces-ae.c
+++ b/test/i-128/traces-ae.c
@@ -78,7 +78,7 @@ const vector VECTORS[] = {
0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
- 0x40, 0x01
+ 0x40, 0x41
},
.message_len = 66,
.message = (uint8_t[]) {
@@ -90,7 +90,7 @@ const vector VECTORS[] = {
0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
- 0x40, 0x01
+ 0x40, 0x41
}
}
};
diff --git a/test/i-192/traces-ae.c b/test/i-192/traces-ae.c
index 6448928..328204a 100644
--- a/test/i-192/traces-ae.c
+++ b/test/i-192/traces-ae.c
@@ -80,7 +80,7 @@ const vector VECTORS[] = {
0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
- 0x40, 0x01
+ 0x40, 0x41
},
.message_len = 66,
.message = (uint8_t[]) {
@@ -92,7 +92,7 @@ const vector VECTORS[] = {
0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
- 0x40, 0x01
+ 0x40, 0x41
}
}
};
diff --git a/test/i-256/traces-ae.c b/test/i-256/traces-ae.c
index 946518e..9b75273 100644
--- a/test/i-256/traces-ae.c
+++ b/test/i-256/traces-ae.c
@@ -82,7 +82,7 @@ const vector VECTORS[] = {
0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
- 0x40, 0x01
+ 0x40, 0x41
},
.message_len = 66,
.message = (uint8_t[]) {
@@ -94,7 +94,7 @@ const vector VECTORS[] = {
0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
- 0x40, 0x01
+ 0x40, 0x41
}
}
};
diff --git a/test/ii-128/traces-ae.c b/test/ii-128/traces-ae.c
index 441ae37..a22260d 100644
--- a/test/ii-128/traces-ae.c
+++ b/test/ii-128/traces-ae.c
@@ -78,7 +78,7 @@ const vector VECTORS[] = {
0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
- 0x40, 0x01
+ 0x40, 0x41
},
.message_len = 66,
.message = (uint8_t[]) {
@@ -90,7 +90,7 @@ const vector VECTORS[] = {
0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
- 0x40, 0x01
+ 0x40, 0x41
}
}
};
diff --git a/test/ii-192/traces-ae.c b/test/ii-192/traces-ae.c
index 6448928..328204a 100644
--- a/test/ii-192/traces-ae.c
+++ b/test/ii-192/traces-ae.c
@@ -80,7 +80,7 @@ const vector VECTORS[] = {
0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
- 0x40, 0x01
+ 0x40, 0x41
},
.message_len = 66,
.message = (uint8_t[]) {
@@ -92,7 +92,7 @@ const vector VECTORS[] = {
0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
- 0x40, 0x01
+ 0x40, 0x41
}
}
};
diff --git a/test/ii-256/traces-ae.c b/test/ii-256/traces-ae.c
index 946518e..9b75273 100644
--- a/test/ii-256/traces-ae.c
+++ b/test/ii-256/traces-ae.c
@@ -82,7 +82,7 @@ const vector VECTORS[] = {
0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
- 0x40, 0x01
+ 0x40, 0x41
},
.message_len = 66,
.message = (uint8_t[]) {
@@ -94,7 +94,7 @@ const vector VECTORS[] = {
0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
- 0x40, 0x01
+ 0x40, 0x41
}
}
};