Update libsrtp to 1.5.2

srtp/crypto/test/rand_gen.c

 /*
  * rand_gen.c
  *
  * a random source (random number generator)
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  */
 /*
  *      
@@ skipping 30 matching lines @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 
 #ifdef HAVE_CONFIG_H
     #include <config.h>
 #endif
 
 #include <stdio.h>           /* for printf() */
-#include <unistd.h>          /* for getopt() */
+#include "getopt_s.h"
 #include "crypto_kernel.h"
 
 /*
  * MAX_PRINT_STRING_LEN is defined in datatypes.h, and is the length
  * of the largest hexadecimal string that can be generated by the
  * function octet_string_hex_string().
  */
 
 #define BUF_LEN (MAX_PRINT_STRING_LEN/2)
 
 void
 usage(char *prog_name) {
   printf("usage: %s -n <num_bytes> [-l][ -d debug_module ]*\n"
          "   -n <num>   output <num> random bytes, where <num>"
          " is between zero and %d\n"
          "   -l         list the avaliable debug modules\n"
          "   -d <mod>   turn on debugging module <mod>\n", 
          prog_name, BUF_LEN);
   exit(255);
 }
 
 int
 main (int argc, char *argv[]) {
-  extern char *optarg;
   int q;
   int num_octets = 0;
   unsigned do_list_mods = 0;
   err_status_t status;
 
   if (argc == 1)
     usage(argv[0]);
 
   /* initialize kernel - we need to do this before anything else */ 
   status = crypto_kernel_init();
   if (status) {
     printf("error: crypto_kernel init failed\n");
     exit(1);
   }
 
   /* process input arguments */
   while (1) {
-    q = getopt(argc, argv, "ld:n:");
+    q = getopt_s(argc, argv, "ld:n:");
     if (q == -1) 
       break;
     switch (q) {
     case 'd':
-      status = crypto_kernel_set_debug_module(optarg, 1);
+      status = crypto_kernel_set_debug_module(optarg_s, 1);
       if (status) {
-        printf("error: set debug module (%s) failed\n", optarg);
+        printf("error: set debug module (%s) failed\n", optarg_s);
         exit(1);
       }
       break;
     case 'l':
       do_list_mods = 1;
       break;
     case 'n':
-      num_octets = atoi(optarg);
+      num_octets = atoi(optarg_s);
       if (num_octets < 0 || num_octets > BUF_LEN)
         usage(argv[0]);
       break;
     default:
       usage(argv[0]);
     }    
   }
 
   if (do_list_mods) {
     status = crypto_kernel_list_debug_modules();
@@ skipping 16 matching lines @@
 
   status = crypto_kernel_shutdown();
   if (status) {
     printf("error: crypto_kernel shutdown failed\n");
     exit(1);
   }
   
   return 0;
 }