diff options
| author | Samuel Neves <sneves@dei.uc.pt> | 2016-06-11 14:47:20 +0300 |
|---|---|---|
| committer | Samuel Neves <sneves@dei.uc.pt> | 2016-06-11 14:47:20 +0300 |
| commit | ab60beb7a1c9bdce7315f7324338793610df934a (patch) | |
| tree | d4505fdcc496f40f5178978e82c60fa9135fcc0b | |
| parent | 932be4e9f5c973a2aa49656447683fbfae4cfb39 (diff) | |
adjust api in kats
| -rw-r--r-- | ref/genkat-c.c | 4 | ||||
| -rw-r--r-- | ref/genkat-json.c | 8 | ||||
| -rw-r--r-- | sse/genkat-c.c | 4 | ||||
| -rw-r--r-- | sse/genkat-json.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/ref/genkat-c.c b/ref/genkat-c.c index 24fabaf..1525f8d 100644 --- a/ref/genkat-c.c +++ b/ref/genkat-c.c @@ -32,7 +32,7 @@ do \ \ for( size_t i = 0; i < LENGTH; ++i ) \ { \ - name( hash, in, NULL, size_prefix ## _OUTBYTES, i, 0 ); \ + name( hash, size_prefix ## _OUTBYTES, in, i, NULL, 0 ); \ printf( "\t{\n\t\t" ); \ \ for( int j = 0; j < size_prefix ## _OUTBYTES; ++j ) \ @@ -52,7 +52,7 @@ do \ \ for( size_t i = 0; i < LENGTH; ++i ) \ { \ - name( hash, in, key, size_prefix ## _OUTBYTES, i, size_prefix ## _KEYBYTES ); \ + name( hash, size_prefix ## _OUTBYTES, in, i, key, size_prefix ## _KEYBYTES ); \ printf( "\t{\n\t\t" ); \ \ for( int j = 0; j < size_prefix ## _OUTBYTES; ++j ) \ diff --git a/ref/genkat-json.c b/ref/genkat-json.c index 81a5cbe..f230928 100644 --- a/ref/genkat-json.c +++ b/ref/genkat-json.c @@ -40,7 +40,7 @@ do \ printf(" \"key\": \"\",\n");\ printf(" \"out\": \"");\ \ - name( hash, in, NULL, size_prefix ## _OUTBYTES, i, 0 ); \ + name( hash, size_prefix ## _OUTBYTES, in, i, NULL, 0 ); \ \ for( int j = 0; j < size_prefix ## _OUTBYTES; ++j ) \ printf( "%02x", hash[j]);\ @@ -66,7 +66,7 @@ do \ printf("\",\n");\ printf(" \"out\": \"");\ \ - name( hash, in, key, size_prefix ## _OUTBYTES, i, size_prefix ## _KEYBYTES ); \ + name( hash, size_prefix ## _OUTBYTES, in, i, key, size_prefix ## _KEYBYTES ); \ \ for( int j = 0; j < size_prefix ## _OUTBYTES; ++j ) \ printf( "%02x", hash[j]);\ @@ -88,7 +88,7 @@ int main( int argc, char **argv ) for( size_t i = 0; i < sizeof( key ); ++i ) key[i] = i; - printf("["); + printf("["); MAKE_KAT( blake2s, BLAKE2S ); MAKE_KEYED_KAT( blake2s, BLAKE2S ); MAKE_KAT( blake2b, BLAKE2B ); @@ -97,7 +97,7 @@ int main( int argc, char **argv ) MAKE_KEYED_KAT( blake2sp, BLAKE2S ); MAKE_KAT( blake2bp, BLAKE2B ); MAKE_KEYED_KAT( blake2bp, BLAKE2B ); - printf("\n]\n"); + printf("\n]\n"); fflush(stdout); return 0; } diff --git a/sse/genkat-c.c b/sse/genkat-c.c index 24fabaf..1525f8d 100644 --- a/sse/genkat-c.c +++ b/sse/genkat-c.c @@ -32,7 +32,7 @@ do \ \ for( size_t i = 0; i < LENGTH; ++i ) \ { \ - name( hash, in, NULL, size_prefix ## _OUTBYTES, i, 0 ); \ + name( hash, size_prefix ## _OUTBYTES, in, i, NULL, 0 ); \ printf( "\t{\n\t\t" ); \ \ for( int j = 0; j < size_prefix ## _OUTBYTES; ++j ) \ @@ -52,7 +52,7 @@ do \ \ for( size_t i = 0; i < LENGTH; ++i ) \ { \ - name( hash, in, key, size_prefix ## _OUTBYTES, i, size_prefix ## _KEYBYTES ); \ + name( hash, size_prefix ## _OUTBYTES, in, i, key, size_prefix ## _KEYBYTES ); \ printf( "\t{\n\t\t" ); \ \ for( int j = 0; j < size_prefix ## _OUTBYTES; ++j ) \ diff --git a/sse/genkat-json.c b/sse/genkat-json.c index eda1146..f230928 100644 --- a/sse/genkat-json.c +++ b/sse/genkat-json.c @@ -40,7 +40,7 @@ do \ printf(" \"key\": \"\",\n");\ printf(" \"out\": \"");\ \ - name( hash, in, NULL, size_prefix ## _OUTBYTES, i, 0 ); \ + name( hash, size_prefix ## _OUTBYTES, in, i, NULL, 0 ); \ \ for( int j = 0; j < size_prefix ## _OUTBYTES; ++j ) \ printf( "%02x", hash[j]);\ @@ -66,7 +66,7 @@ do \ printf("\",\n");\ printf(" \"out\": \"");\ \ - name( hash, in, key, size_prefix ## _OUTBYTES, i, size_prefix ## _KEYBYTES ); \ + name( hash, size_prefix ## _OUTBYTES, in, i, key, size_prefix ## _KEYBYTES ); \ \ for( int j = 0; j < size_prefix ## _OUTBYTES; ++j ) \ printf( "%02x", hash[j]);\ |