From f768be81d804d0467be4ad7163216c8381872b94 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Fri, 31 Oct 2008 19:30:11 +0000 Subject: size_t-fy AES, Camellia and RC4. --- crypto/camellia/camellia.h | 14 ++++++++------ crypto/camellia/cmll_cbc.c | 5 ++--- crypto/camellia/cmll_cfb.c | 15 +++++++-------- crypto/camellia/cmll_ctr.c | 5 ++--- crypto/camellia/cmll_ofb.c | 5 ++--- 5 files changed, 21 insertions(+), 23 deletions(-) (limited to 'crypto/camellia') diff --git a/crypto/camellia/camellia.h b/crypto/camellia/camellia.h index 5dd423b29b..055a25582c 100644 --- a/crypto/camellia/camellia.h +++ b/crypto/camellia/camellia.h @@ -58,6 +58,8 @@ #error CAMELLIA is disabled. #endif +#include + #define CAMELLIA_ENCRYPT 1 #define CAMELLIA_DECRYPT 0 @@ -97,25 +99,25 @@ void Camellia_decrypt(const unsigned char *in, unsigned char *out, void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out, const CAMELLIA_KEY *key, const int enc); void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out, - const unsigned long length, const CAMELLIA_KEY *key, + size_t length, const CAMELLIA_KEY *key, unsigned char *ivec, const int enc); void Camellia_cfb128_encrypt(const unsigned char *in, unsigned char *out, - const unsigned long length, const CAMELLIA_KEY *key, + size_t length, const CAMELLIA_KEY *key, unsigned char *ivec, int *num, const int enc); void Camellia_cfb1_encrypt(const unsigned char *in, unsigned char *out, - const unsigned long length, const CAMELLIA_KEY *key, + size_t length, const CAMELLIA_KEY *key, unsigned char *ivec, int *num, const int enc); void Camellia_cfb8_encrypt(const unsigned char *in, unsigned char *out, - const unsigned long length, const CAMELLIA_KEY *key, + size_t length, const CAMELLIA_KEY *key, unsigned char *ivec, int *num, const int enc); void Camellia_cfbr_encrypt_block(const unsigned char *in,unsigned char *out, const int nbits,const CAMELLIA_KEY *key, unsigned char *ivec,const int enc); void Camellia_ofb128_encrypt(const unsigned char *in, unsigned char *out, - const unsigned long length, const CAMELLIA_KEY *key, + size_t length, const CAMELLIA_KEY *key, unsigned char *ivec, int *num); void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out, - const unsigned long length, const CAMELLIA_KEY *key, + size_t length, const CAMELLIA_KEY *key, unsigned char ivec[CAMELLIA_BLOCK_SIZE], unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE], unsigned int *num); diff --git a/crypto/camellia/cmll_cbc.c b/crypto/camellia/cmll_cbc.c index 545e6c1f41..421c33127b 100644 --- a/crypto/camellia/cmll_cbc.c +++ b/crypto/camellia/cmll_cbc.c @@ -60,12 +60,11 @@ #include #include "cmll_locl.h" void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out, - const unsigned long length, const CAMELLIA_KEY *key, + size_t len, const CAMELLIA_KEY *key, unsigned char *ivec, const int enc) { - unsigned long n; - unsigned long len = length; + size_t n; unsigned char tmp[CAMELLIA_BLOCK_SIZE]; const unsigned char *iv = ivec; diff --git a/crypto/camellia/cmll_cfb.c b/crypto/camellia/cmll_cfb.c index af0f9f49ad..8eed2be9ea 100644 --- a/crypto/camellia/cmll_cfb.c +++ b/crypto/camellia/cmll_cfb.c @@ -124,12 +124,11 @@ */ void Camellia_cfb128_encrypt(const unsigned char *in, unsigned char *out, - const unsigned long length, const CAMELLIA_KEY *key, + size_t length, const CAMELLIA_KEY *key, unsigned char *ivec, int *num, const int enc) { unsigned int n; - unsigned long l = length; unsigned char c; assert(in && out && key && ivec && num); @@ -138,7 +137,7 @@ void Camellia_cfb128_encrypt(const unsigned char *in, unsigned char *out, if (enc) { - while (l--) + while (length--) { if (n == 0) { @@ -150,7 +149,7 @@ void Camellia_cfb128_encrypt(const unsigned char *in, unsigned char *out, } else { - while (l--) + while (length--) { if (n == 0) { @@ -202,10 +201,10 @@ void Camellia_cfbr_encrypt_block(const unsigned char *in,unsigned char *out, /* N.B. This expects the input to be packed, MS bit first */ void Camellia_cfb1_encrypt(const unsigned char *in, unsigned char *out, - const unsigned long length, const CAMELLIA_KEY *key, + size_t length, const CAMELLIA_KEY *key, unsigned char *ivec, int *num, const int enc) { - unsigned int n; + size_t n; unsigned char c[1],d[1]; assert(in && out && key && ivec && num); @@ -221,10 +220,10 @@ void Camellia_cfb1_encrypt(const unsigned char *in, unsigned char *out, } void Camellia_cfb8_encrypt(const unsigned char *in, unsigned char *out, - const unsigned long length, const CAMELLIA_KEY *key, + size_t length, const CAMELLIA_KEY *key, unsigned char *ivec, int *num, const int enc) { - unsigned int n; + size_t n; assert(in && out && key && ivec && num); assert(*num == 0); diff --git a/crypto/camellia/cmll_ctr.c b/crypto/camellia/cmll_ctr.c index cc21b70890..332749ef76 100644 --- a/crypto/camellia/cmll_ctr.c +++ b/crypto/camellia/cmll_ctr.c @@ -113,21 +113,20 @@ static void Camellia_ctr128_inc(unsigned char *counter) * into the rest of the IV when incremented. */ void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out, - const unsigned long length, const CAMELLIA_KEY *key, + size_t length, const CAMELLIA_KEY *key, unsigned char ivec[CAMELLIA_BLOCK_SIZE], unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE], unsigned int *num) { unsigned int n; - unsigned long l=length; assert(in && out && key && counter && num); assert(*num < CAMELLIA_BLOCK_SIZE); n = *num; - while (l--) + while (length--) { if (n == 0) { diff --git a/crypto/camellia/cmll_ofb.c b/crypto/camellia/cmll_ofb.c index d89cf9f3b3..1646fc0ce7 100644 --- a/crypto/camellia/cmll_ofb.c +++ b/crypto/camellia/cmll_ofb.c @@ -119,17 +119,16 @@ * 128bit block we have used is contained in *num; */ void Camellia_ofb128_encrypt(const unsigned char *in, unsigned char *out, - const unsigned long length, const CAMELLIA_KEY *key, + size_t length, const CAMELLIA_KEY *key, unsigned char *ivec, int *num) { unsigned int n; - unsigned long l=length; assert(in && out && key && ivec && num); n = *num; - while (l--) { + while (length--) { if (n == 0) { Camellia_encrypt(ivec, ivec, key); } -- cgit v1.2.3