diff options
| author | Samuel Neves <sneves@dei.uc.pt> | 2017-03-07 21:42:27 +0300 |
|---|---|---|
| committer | Samuel Neves <sneves@dei.uc.pt> | 2017-03-07 21:42:27 +0300 |
| commit | 5cbb39c9ef8007f0b63723e3aea06cd0887e36ad (patch) | |
| tree | 077e39825dff428c39afe7186a7475fbc4cae921 /sse | |
| parent | 7728c30896d3fa0c3b4df52c2bd5a1e36f8f1287 (diff) | |
issue #41
Diffstat (limited to 'sse')
| -rw-r--r-- | sse/genkat-json.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/sse/genkat-json.c b/sse/genkat-json.c index 6d6b341..0275fb5 100644 --- a/sse/genkat-json.c +++ b/sse/genkat-json.c @@ -25,10 +25,10 @@ #define LENGTH 256 -#define MAKE_KAT(name, size_prefix) \ +#define MAKE_KAT(name, size_prefix, first) \ do { \ for (i = 0; i < LENGTH; ++i) { \ - printf("\n{\n"); \ + printf("%s\n{\n", i == 0 && first ? "" : ","); \ \ printf(" \"hash\": \"" #name "\",\n"); \ printf(" \"in\": \""); \ @@ -44,14 +44,14 @@ for (j = 0; j < size_prefix##_OUTBYTES; ++j) \ printf("%02x", hash[j]); \ printf("\"\n"); \ - printf("},"); \ + printf("}"); \ } \ } while (0) -#define MAKE_KEYED_KAT(name, size_prefix) \ +#define MAKE_KEYED_KAT(name, size_prefix, first) \ do { \ for (i = 0; i < LENGTH; ++i) { \ - printf("\n{\n"); \ + printf("%s\n{\n", i == 0 && first ? "" : ","); \ \ printf(" \"hash\": \"" #name "\",\n"); \ printf(" \"in\": \""); \ @@ -70,14 +70,14 @@ for (j = 0; j < size_prefix##_OUTBYTES; ++j) \ printf("%02x", hash[j]); \ printf("\"\n"); \ - printf("},"); \ + printf("}"); \ } \ } while (0) -#define MAKE_XOF_KAT(name) \ +#define MAKE_XOF_KAT(name, first) \ do { \ for (i = 1; i <= LENGTH; ++i) { \ - printf("\n{\n"); \ + printf("%s\n{\n", i == 1 && first ? "" : ","); \ \ printf(" \"hash\": \"" #name "\",\n"); \ printf(" \"in\": \""); \ @@ -93,14 +93,14 @@ for (j = 0; j < i; ++j) \ printf("%02x", hash[j]); \ printf("\"\n"); \ - printf("},"); \ + printf("}"); \ } \ } while (0) -#define MAKE_XOF_KEYED_KAT(name, size_prefix) \ +#define MAKE_XOF_KEYED_KAT(name, size_prefix, first) \ do { \ for (i = 1; i <= LENGTH; ++i) { \ - printf("\n{\n"); \ + printf("%s\n{\n", i == 1 && first ? "" : ","); \ \ printf(" \"hash\": \"" #name "\",\n"); \ printf(" \"in\": \""); \ @@ -119,7 +119,7 @@ for (j = 0; j < i; ++j) \ printf("%02x", hash[j]); \ printf("\"\n"); \ - printf("},"); \ + printf("}"); \ } \ } while (0) @@ -136,18 +136,18 @@ int main() { key[i] = i; printf("["); - MAKE_KAT(blake2s, BLAKE2S); - MAKE_KEYED_KAT(blake2s, BLAKE2S); - MAKE_KAT(blake2b, BLAKE2B); - MAKE_KEYED_KAT(blake2b, BLAKE2B); - MAKE_KAT(blake2sp, BLAKE2S); - MAKE_KEYED_KAT(blake2sp, BLAKE2S); - MAKE_KAT(blake2bp, BLAKE2B); - MAKE_KEYED_KAT(blake2bp, BLAKE2B); - MAKE_XOF_KAT(blake2xs); - MAKE_XOF_KEYED_KAT(blake2xs, BLAKE2S); - MAKE_XOF_KAT(blake2xb); - MAKE_XOF_KEYED_KAT(blake2xb, BLAKE2B); + MAKE_KAT(blake2s, BLAKE2S, 1); + MAKE_KEYED_KAT(blake2s, BLAKE2S, 0); + MAKE_KAT(blake2b, BLAKE2B, 0); + MAKE_KEYED_KAT(blake2b, BLAKE2B, 0); + MAKE_KAT(blake2sp, BLAKE2S, 0); + MAKE_KEYED_KAT(blake2sp, BLAKE2S, 0); + MAKE_KAT(blake2bp, BLAKE2B, 0); + MAKE_KEYED_KAT(blake2bp, BLAKE2B, 0); + MAKE_XOF_KAT(blake2xs, 0); + MAKE_XOF_KEYED_KAT(blake2xs, BLAKE2S, 0); + MAKE_XOF_KAT(blake2xb, 0); + MAKE_XOF_KEYED_KAT(blake2xb, BLAKE2B, 0); printf("\n]\n"); fflush(stdout); return 0; |