fix warnings

This commit is contained in:
Dr. Stephen Henson 2010-10-04 13:45:15 +00:00
parent 7e0de9e8a6
commit 0c7246ed4b

View File

@ -164,7 +164,7 @@ void aesni_cbc_encrypt(const unsigned char *in,
void aesni_ctr32_encrypt_blocks(const unsigned char *in, void aesni_ctr32_encrypt_blocks(const unsigned char *in,
unsigned char *out, unsigned char *out,
size_t blocks, size_t blocks,
const AES_KEY *key, const void *key,
const unsigned char *ivec); const unsigned char *ivec);
/* Function for ENGINE detection and control */ /* Function for ENGINE detection and control */
@ -384,6 +384,7 @@ DECLARE_AES_EVP(256,cbc,CBC);
DECLARE_AES_EVP(256,cfb,CFB); DECLARE_AES_EVP(256,cfb,CFB);
DECLARE_AES_EVP(256,ofb,OFB); DECLARE_AES_EVP(256,ofb,OFB);
#if notused
static void ctr96_inc(unsigned char *counter) { static void ctr96_inc(unsigned char *counter) {
u32 n=12; u32 n=12;
u8 c; u8 c;
@ -396,6 +397,7 @@ static void ctr96_inc(unsigned char *counter) {
if (c) return; if (c) return;
} while (n); } while (n);
} }
#endif
static int aesni_counter(EVP_CIPHER_CTX *ctx, unsigned char *out, static int aesni_counter(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t len) const unsigned char *in, size_t len)
@ -403,7 +405,7 @@ static int aesni_counter(EVP_CIPHER_CTX *ctx, unsigned char *out,
AES_KEY *key = AESNI_ALIGN(ctx->cipher_data); AES_KEY *key = AESNI_ALIGN(ctx->cipher_data);
CRYPTO_ctr128_encrypt_ctr32(in,out,len,key, CRYPTO_ctr128_encrypt_ctr32(in,out,len,key,
ctx->iv,ctx->buf,&ctx->num, ctx->iv,ctx->buf,(unsigned int *)&ctx->num,
aesni_ctr32_encrypt_blocks); aesni_ctr32_encrypt_blocks);
return 1; return 1;
} }