diff options
| author | Ben Laurie <ben@openssl.org> | 2008-11-02 13:15:06 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2008-11-02 13:15:06 +0000 |
| commit | 5ee92a5ec1c743b5d3b5d2c7558d0f39e302b7e7 (patch) | |
| tree | 5d3b507bb2839e732af1acd2bb537ce5302728b5 /crypto/camellia | |
| parent | c76fd290be9e4a755dde3c5fe1ed886a89e30fc6 (diff) | |
Fix asserts. Fix incorrect dependency.
Diffstat (limited to 'crypto/camellia')
| -rw-r--r-- | crypto/camellia/Makefile | 3 | ||||
| -rw-r--r-- | crypto/camellia/cmll_ctr.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/crypto/camellia/Makefile b/crypto/camellia/Makefile index 6e9d762e90..223a807481 100644 --- 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 332749ef76..a6cdc66957 100644 --- 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; |