Commit 5ee92a5e authored by Ben Laurie's avatar Ben Laurie
Browse files

Fix asserts. Fix incorrect dependency.

parent c76fd290

crypto/aes/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ lib: $(LIBOBJ) 
	$(RANLIB) $(LIB) || echo Never mind.

	@touch lib



$(LIBOBJ): $(LIBSRC)



aes-ia64.s: asm/aes-ia64.S

	$(CC) $(CFLAGS) -E asm/aes-ia64.S > $@

crypto/aes/aes_ctr.c

+7 −8
Original line number Diff line number Diff line
@@ -54,9 +54,9 @@ 
#  define NDEBUG

# endif

#endif

#include <assert.h>



#include <openssl/aes.h>

#include <openssl/crypto.h>

#include "aes_locl.h"



/* NOTE: the IV/counter CTR mode is big-endian.  The rest of the AES code
@@ -117,11 +117,10 @@ void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out, 
			unsigned char ivec[AES_BLOCK_SIZE],

			unsigned char ecount_buf[AES_BLOCK_SIZE],

			unsigned int *num) {



	unsigned int n;



	assert(in && out && key && counter && num);

	assert(*num < AES_BLOCK_SIZE);

	OPENSSL_assert(in && out && key && ecount_buf && num);

	OPENSSL_assert(*num < AES_BLOCK_SIZE);



	n = *num;

crypto/camellia/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -44,9 +44,6 @@ lib: $(LIBOBJ) 
	$(RANLIB) $(LIB) || echo Never mind.

	@touch lib



$(LIBOBJ): $(LIBSRC)





files:

	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO

crypto/camellia/cmll_ctr.c

+3 −2
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#include <assert.h>



#include <openssl/camellia.h>

#include <openssl/crypto.h>

#include "cmll_locl.h"



/* NOTE: the IV/counter CTR mode is big-endian.  The rest of the Camellia code
@@ -121,8 +122,8 @@ void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out, 


	unsigned int n;



	assert(in && out && key && counter && num);

	assert(*num < CAMELLIA_BLOCK_SIZE);

	OPENSSL_assert(in && out && key && ecount_buf && num);

	OPENSSL_assert(*num < CAMELLIA_BLOCK_SIZE);



	n = *num;