Commit 7c81de9a authored by Ben Laurie's avatar Ben Laurie
Browse files

Make it build and test.

parent a2eef419

crypto/evp/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ AR= ar r 
CFLAGS= $(INCLUDES) $(CFLAG)



GENERAL=Makefile

TEST=evp_test.c

TEST=evp_test.c aeadtest.c

TESTDATA=evptests.txt

APPS=

crypto/evp/aeadtest.c

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ enum 
	CT,       /* hex encoded ciphertext (not including the authenticator,

		     which is next. */

	TAG,      /* hex encoded authenticator. */

	NUM_TYPES,

	NUM_TYPES

	};



static const char NAMES[6][NUM_TYPES] =
@@ -257,7 +257,7 @@ int main(int argc, char **argv) 
		unsigned int i, type_len = 0;



		unsigned char *buf = NULL;

		unsigned int *buf_len;

		unsigned int *buf_len = NULL;



		if (!fgets(line, sizeof(line), f))

			break;

crypto/poly1305/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) 
AFLAGS= $(ASFLAGS)



GENERAL=Makefile

TEST=

TEST=poly1305test

APPS=



LIB=$(TOP)/libcrypto.a

crypto/poly1305/poly1305_vec.c

+6 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ 
 * ====================================================================

 */



#ifdef PEDANTIC

# include "poly1305.c"

#else



/* This implementation of poly1305 is by Andrew Moon

 * (https://github.com/floodyberry/poly1305-donna) and released as public

 * domain. It implements SIMD vectorization based on the algorithm described in
@@ -731,3 +735,5 @@ poly1305_donna_finish: 
	}



#endif  /* !OPENSSL_NO_POLY1305 */



#endif  /* !PEDANTIC */

test/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -345,7 +345,8 @@ test_poly1305: $(POLY1305TEST)$(EXE_EXT) 
	@echo "Test Poly1305"

	../util/shlib_wrap.sh ./$(POLY1305TEST)



test_aead: $(AEADTEST)$(EXE_EXT)

test_aead: $(AEADTEST)$(EXE_EXT) chacha20_poly1305_tests.txt \

           aes_128_gcm_tests.txt aes_256_gcm_tests.txt

	@echo "Test ChaCha20+Poly1305"

	../util/shlib_wrap.sh ./$(AEADTEST) chacha20-poly1305 \

		chacha20_poly1305_tests.txt