1
1
mirror of https://github.com/BLAKE2/BLAKE2 synced 2024-11-26 04:26:12 +01:00

Merge pull request #3 from neheb/master

Fix makefiles + bench fix
This commit is contained in:
Samuel Neves 2015-11-05 07:38:38 +00:00
commit 2d362fbb68
4 changed files with 16 additions and 2 deletions

@ -1,7 +1,7 @@
CC=gcc
CFLAGS=-std=c99 -O3 -march=native -I../sse -static -fopenmp
LIBS=
#FILES=blake2sum.c ../ref/blake2b-ref.c ../ref/blake2s-ref.c ../ref/blake2bp-ref.c ../ref/blake2sp-ref.c
#FILES=b2sum.c ../ref/blake2b-ref.c ../ref/blake2s-ref.c ../ref/blake2bp-ref.c ../ref/blake2sp-ref.c
FILES=b2sum.c ../sse/blake2b.c ../sse/blake2s.c ../sse/blake2bp.c ../sse/blake2sp.c
all: $(FILES)
$(CC) $(FILES) $(CFLAGS) $(LIBS) -o b2sum

@ -365,6 +365,13 @@ int blake2b( uint8_t *out, const void *in, const void *key, const uint8_t outlen
return 0;
}
#if defined(SUPERCOP)
int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen )
{
return blake2b( out, in, NULL, BLAKE2B_OUTBYTES, inlen, 0 );
}
#endif
#if defined(BLAKE2B_SELFTEST)
#include <string.h>
#include "blake2-kat.h"

@ -353,6 +353,13 @@ int blake2s( uint8_t *out, const void *in, const void *key, const uint8_t outlen
return 0;
}
#if defined(SUPERCOP)
int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen )
{
return blake2s( out, in, NULL, BLAKE2S_OUTBYTES, inlen, 0 );
}
#endif
#if defined(BLAKE2S_SELFTEST)
#include <string.h>
#include "blake2-kat.h"

@ -1,4 +1,4 @@
CC?=gcc
CC=gcc
CFLAGS=-std=c99 -Wall -pedantic
all: blake2s blake2b blake2sp blake2bp