fix --strict-warnings

Reviewed-by: NPaul Dale <paul.dale@oracle.com>
Reviewed-by: NMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4717)

engines/e_afalg.c

@@ -80,6 +80,7 @@ static int afalg_destroy(ENGINE *e);
 static int afalg_init(ENGINE *e);
 static int afalg_finish(ENGINE *e);
 const EVP_CIPHER *afalg_aes_cbc(int nid);
+cbc_handles *get_cipher_handle(int nid);
 static int afalg_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
                          const int **nids, int nid);
 static int afalg_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
@@ -845,7 +846,7 @@ static int afalg_finish(ENGINE *e)
 
 static int free_cbc(void)
 {
-    short int i;
+    short unsigned int i;
     for(i = 0; i < OSSL_NELEM(afalg_cipher_nids); i++) {
         EVP_CIPHER_meth_free(cbc_handle[i]._hidden);
         cbc_handle[i]._hidden = NULL;

test/afalgtest.c

@@ -62,7 +62,7 @@ static int test_afalg_aes_cbc(int keysize_idx)
                                     "\xb1\x9e\xe0\xdf\x61\xb9\xc2\x55\xeb";
     unsigned char encresult_256[] = "\xa0\x76\x85\xfd\xc1\x65\x71\x9d"
                                     "\xc7\xe9\x13\x6e\xae\x55\x49\xb4\x13";
-    unsigned char *enc_result;
+    unsigned char *enc_result = NULL;
 
     int encl, encf, decl, decf;
     int ret = 0;