From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 4 Oct 2010 13:45:15 +0000 (+0000)
Subject: fix warnings
X-Git-Tag: OpenSSL-fips-2_0-rc1~965
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=0c7246ed4bec060aa6c0b834e5ca0c02739254b5

fix warnings
---

diff --git a/crypto/engine/eng_aesni.c b/crypto/engine/eng_aesni.c
index 1123758261..e9f277390a 100644
--- a/crypto/engine/eng_aesni.c
+++ b/crypto/engine/eng_aesni.c
@@ -164,7 +164,7 @@ void aesni_cbc_encrypt(const unsigned char *in,
 void aesni_ctr32_encrypt_blocks(const unsigned char *in,
 			   unsigned char *out,
 			   size_t blocks,
-			   const AES_KEY *key,
+			   const void *key,
 			   const unsigned char *ivec);
 
 /* 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,ofb,OFB);
 
+#if notused
 static void ctr96_inc(unsigned char *counter) {
 	u32 n=12;
 	u8  c;
@@ -396,6 +397,7 @@ static void ctr96_inc(unsigned char *counter) {
 		if (c) return;
 	} while (n);
 }
+#endif
 
 static int aesni_counter(EVP_CIPHER_CTX *ctx, unsigned char *out,
 		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);
 
 	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);
 	return 1;
 }