Fix asserts. Fix incorrect dependency.

diff --git a/crypto/aes/Makefile b/crypto/aes/Makefile
index 8b878ad818f73df7dbcee9dfcea3ab0a58d15392..7a55dd6ca58b2483ba17e4432bf91a0b531858d8 100644 (file)
--- a/crypto/aes/Makefile
+++ b/crypto/aes/Makefile
@@ -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 > $@
 

diff --git a/crypto/aes/aes_ctr.c b/crypto/aes/aes_ctr.c
index 501900a2ef4a1af16ae851c19e23cd2a59762492..9b793a9e235e36735fbdbfa5b976912939ecf5b4 100644 (file)
--- a/crypto/aes/aes_ctr.c
+++ b/crypto/aes/aes_ctr.c
@@ -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
@@ -113,15 +113,14 @@ static void AES_ctr128_inc(unsigned char *counter) {
  * into the rest of the IV when incremented.
  */
 void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-       size_t length, const AES_KEY *key,
-       unsigned char ivec[AES_BLOCK_SIZE],
-       unsigned char ecount_buf[AES_BLOCK_SIZE],
-       unsigned int *num) {
-
+                       size_t length, const AES_KEY *key,
+                       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;
 

diff --git a/crypto/camellia/Makefile b/crypto/camellia/Makefile
index 6e9d762e90214d59d7308a9d524ecec50244107e..223a807481faf8a43baaa9717b72cafc19943c61 100644 (file)
--- a/crypto/camellia/Makefile
+++ b/crypto/camellia/Makefile
@@ -44,9 +44,6 @@ lib:  $(LIBOBJ)
        $(RANLIB) $(LIB) || echo Never mind.
        @touch lib
 
-$(LIBOBJ): $(LIBSRC)
-
-
 files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 

diff --git a/crypto/camellia/cmll_ctr.c b/crypto/camellia/cmll_ctr.c
index 332749ef76c9a711e2ae9e5c3d8fb513b91d71e5..a6cdc6695793764f9f3f1693f5231979c1a1b4df 100644 (file)
--- a/crypto/camellia/cmll_ctr.c
+++ b/crypto/camellia/cmll_ctr.c
@@ -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;