Build these tests with WARNINGS=Yes and -Werror, and do the necessary

fixes to keep building.

1 files changed, 32 insertions, 23 deletions

diff --git a/src/regress/lib/libcrypto/cts128/cts128test.c b/src/regress/lib/libcrypto/cts128/cts128test.c
index 84a3e0d46b..d910f3d4b8 100644
--- a/src/regress/lib/libcrypto/cts128/cts128test.c
+++ b/src/regress/lib/libcrypto/cts128/cts128test.c
@@ -12,6 +12,9 @@
 #include <openssl/aes.h>
 #include <openssl/modes.h>
 
+void test_vector(const unsigned char *vector,size_t len);
+void test_nistvector(const unsigned char *vector,size_t len);
+
 /* test vectors from RFC 3962 */
 static const unsigned char test_key[16] = "chicken teriyaki";
 static const unsigned char test_input[64] =
@@ -44,12 +47,15 @@ static const unsigned char vector_64[64] =
 
 static AES_KEY encks, decks;
 
-void test_vector(const unsigned char *vector,size_t len)
-{       unsigned char iv[sizeof(test_iv)];
+void
+test_vector(const unsigned char *vector,size_t len)
+{
+        unsigned char iv[sizeof(test_iv)];
         unsigned char cleartext[64],ciphertext[64];
         size_t tail;
 
-        printf("vector_%d\n",len); fflush(stdout);
+        printf("vector_%zu\n",len);
+        fflush(stdout);
 
         if ((tail=len%16) == 0) tail = 16;
         tail += 16;
@@ -58,41 +64,43 @@ void test_vector(const unsigned char *vector,size_t len)
         memcpy(iv,test_iv,sizeof(test_iv));
         CRYPTO_cts128_encrypt_block(test_input,ciphertext,len,&encks,iv,(block128_f)AES_encrypt);
         if (memcmp(ciphertext,vector,len))
-                fprintf(stderr,"output_%d mismatch\n",len), exit(1);
+                fprintf(stderr,"output_%zu mismatch\n",len), exit(1);
         if (memcmp(iv,vector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%d mismatch\n",len), exit(1);
+                fprintf(stderr,"iv_%zu mismatch\n",len), exit(1);
 
         /* test block-based decryption */
         memcpy(iv,test_iv,sizeof(test_iv));
         CRYPTO_cts128_decrypt_block(ciphertext,cleartext,len,&decks,iv,(block128_f)AES_decrypt);
         if (memcmp(cleartext,test_input,len))
-                fprintf(stderr,"input_%d mismatch\n",len), exit(2);
+                fprintf(stderr,"input_%zu mismatch\n",len), exit(2);
         if (memcmp(iv,vector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%d mismatch\n",len), exit(2);
+                fprintf(stderr,"iv_%zu mismatch\n",len), exit(2);
 
         /* test streamed encryption */
         memcpy(iv,test_iv,sizeof(test_iv));
         CRYPTO_cts128_encrypt(test_input,ciphertext,len,&encks,iv,(cbc128_f)AES_cbc_encrypt);
         if (memcmp(ciphertext,vector,len))
-                fprintf(stderr,"output_%d mismatch\n",len), exit(3);
+                fprintf(stderr,"output_%zu mismatch\n",len), exit(3);
         if (memcmp(iv,vector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%d mismatch\n",len), exit(3);
+                fprintf(stderr,"iv_%zu mismatch\n",len), exit(3);
 
         /* test streamed decryption */
         memcpy(iv,test_iv,sizeof(test_iv));
         CRYPTO_cts128_decrypt(ciphertext,cleartext,len,&decks,iv,(cbc128_f)AES_cbc_encrypt);
         if (memcmp(cleartext,test_input,len))
-                fprintf(stderr,"input_%d mismatch\n",len), exit(4);
+                fprintf(stderr,"input_%zu mismatch\n",len), exit(4);
         if (memcmp(iv,vector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%d mismatch\n",len), exit(4);
+                fprintf(stderr,"iv_%zu mismatch\n",len), exit(4);
 }
 
-void test_nistvector(const unsigned char *vector,size_t len)
-{       unsigned char iv[sizeof(test_iv)];
+void
+test_nistvector(const unsigned char *vector,size_t len)
+{
+        unsigned char iv[sizeof(test_iv)];
         unsigned char cleartext[64],ciphertext[64],nistvector[64];
         size_t tail;
 
-        printf("nistvector_%d\n",len); fflush(stdout);
+        printf("nistvector_%zu\n",len); fflush(stdout);
 
         if ((tail=len%16) == 0) tail = 16;
 
@@ -108,36 +116,37 @@ void test_nistvector(const unsigned char *vector,size_t len)
         memcpy(iv,test_iv,sizeof(test_iv));
         CRYPTO_nistcts128_encrypt_block(test_input,ciphertext,len,&encks,iv,(block128_f)AES_encrypt);
         if (memcmp(ciphertext,nistvector,len))
-                fprintf(stderr,"output_%d mismatch\n",len), exit(1);
+                fprintf(stderr,"output_%zu mismatch\n",len), exit(1);
         if (memcmp(iv,nistvector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%d mismatch\n",len), exit(1);
+                fprintf(stderr,"iv_%zu mismatch\n",len), exit(1);
 
         /* test block-based decryption */
         memcpy(iv,test_iv,sizeof(test_iv));
         CRYPTO_nistcts128_decrypt_block(ciphertext,cleartext,len,&decks,iv,(block128_f)AES_decrypt);
         if (memcmp(cleartext,test_input,len))
-                fprintf(stderr,"input_%d mismatch\n",len), exit(2);
+                fprintf(stderr,"input_%zu mismatch\n",len), exit(2);
         if (memcmp(iv,nistvector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%d mismatch\n",len), exit(2);
+                fprintf(stderr,"iv_%zu mismatch\n",len), exit(2);
 
         /* test streamed encryption */
         memcpy(iv,test_iv,sizeof(test_iv));
         CRYPTO_nistcts128_encrypt(test_input,ciphertext,len,&encks,iv,(cbc128_f)AES_cbc_encrypt);
         if (memcmp(ciphertext,nistvector,len))
-                fprintf(stderr,"output_%d mismatch\n",len), exit(3);
+                fprintf(stderr,"output_%zu mismatch\n",len), exit(3);
         if (memcmp(iv,nistvector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%d mismatch\n",len), exit(3);
+                fprintf(stderr,"iv_%zu mismatch\n",len), exit(3);
 
         /* test streamed decryption */
         memcpy(iv,test_iv,sizeof(test_iv));
         CRYPTO_nistcts128_decrypt(ciphertext,cleartext,len,&decks,iv,(cbc128_f)AES_cbc_encrypt);
         if (memcmp(cleartext,test_input,len))
-                fprintf(stderr,"input_%d mismatch\n",len), exit(4);
+                fprintf(stderr,"input_%zu mismatch\n",len), exit(4);
         if (memcmp(iv,nistvector+len-tail,sizeof(iv)))
-                fprintf(stderr,"iv_%d mismatch\n",len), exit(4);
+                fprintf(stderr,"iv_%zu mismatch\n",len), exit(4);
 }
 
-int main()
+int
+main(int argc, char *argv[])
 {
         AES_set_encrypt_key(test_key,128,&encks);
         AES_set_decrypt_key(test_key,128,&decks);