Update libsrtp to 1.5.2

srtp/crypto/test/cipher_driver.c

 /*
  * cipher_driver.c
  *
  * A driver for the generic cipher type
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  */
 
 /*
@@ skipping 32 matching lines @@
  *
  */
 
 #ifdef HAVE_CONFIG_H
     #include <config.h>
 #endif
 
 #include <stdio.h>           /* for printf() */
 #include <stdlib.h>          /* for rand() */
 #include <string.h>          /* for memset() */
-#include <unistd.h>          /* for getopt() */
+#include "getopt_s.h"
 #include "cipher.h"
 #ifdef OPENSSL
 #include "aes_icm_ossl.h"
 #include "aes_gcm_ossl.h"
 #else
 #include "aes_icm.h"
 #endif
 #include "null_cipher.h"
 
 #define PRINT_DEBUG 0
@@ skipping 82 matching lines @@
     0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
     0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
   };
   int q;
   unsigned do_timing_test = 0;
   unsigned do_validation = 0;
   unsigned do_array_timing_test = 0;
 
   /* process input arguments */
   while (1) {
-    q = getopt(argc, argv, "tva");
+    q = getopt_s(argc, argv, "tva");
     if (q == -1) 
       break;
     switch (q) {
     case 't':
       do_timing_test = 1;
       break;
     case 'v':
       do_validation = 1;
       break;
     case 'a':
@@ skipping 199 matching lines @@
   
   return err_status_ok;
 }
 
 /*
  * cipher_driver_test_buffering(ct) tests the cipher's output
  * buffering for correctness by checking the consistency of succesive
  * calls
  */
 
+#define INITIAL_BUFLEN 1024
 err_status_t
 cipher_driver_test_buffering(cipher_t *c) {
   int i, j, num_trials = 1000;
-  unsigned len, buflen = 1024;
-  uint8_t buffer0[buflen], buffer1[buflen], *current, *end;
+  unsigned len, buflen = INITIAL_BUFLEN;
+  uint8_t buffer0[INITIAL_BUFLEN], buffer1[INITIAL_BUFLEN], *current, *end;
   uint8_t idx[16] = { 
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x34
   };
   err_status_t status;
   
   printf("testing output buffering for cipher %s...",
          c->type->description);
 
   for (i=0; i < num_trials; i++) {
 
    /* set buffers to zero */
-    for (j=0; j < buflen; j++) 
+    for (j=0; j < (int) buflen; j++) {
       buffer0[j] = buffer1[j] = 0;
+    }
     
     /* initialize cipher  */
     status = cipher_set_iv(c, idx, direction_encrypt);
     if (status)
       return status;
 
     /* generate 'reference' value by encrypting all at once */
     status = cipher_encrypt(c, buffer0, &buflen);
     if (status)
       return status;
@@ skipping 21 matching lines @@
       
       /* advance pointer into buffer1 to reflect encryption */
       current += len;
       
       /* if buffer1 is all encrypted, break out of loop */
       if (current == end)
         break;
     }
 
     /* compare buffers */
-    for (j=0; j < buflen; j++)
+    for (j=0; j < (int) buflen; j++) {
       if (buffer0[j] != buffer1[j]) {
 #if PRINT_DEBUG
         printf("test case %d failed at byte %d\n", i, j);
         printf("computed: %s\n", octet_string_hex_string(buffer1, buflen));
         printf("expected: %s\n", octet_string_hex_string(buffer0, buflen));
 #endif 
         return err_status_algo_fail;
       }
+    }
   }
   
   printf("passed\n");
 
   return err_status_ok;
 }
 
 
 /*
  * The function cipher_test_throughput_array() tests the effect of CPU
@@ skipping 155 matching lines @@
            status);
     return status;
   }
   
   cipher_array_test_throughput(ca, num_cipher);
   
   cipher_array_delete(ca, num_cipher);    
  
   return err_status_ok;
 }