Update libsrtp to 1.5.2

srtp/crypto/test/kernel_driver.c

 /*
  * kernel_driver.c
  *
  * a test driver for the crypto_kernel
  *
  * 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"
 
 void
 usage(char *prog_name) {
   printf("usage: %s [ -v ][ -d debug_module ]*\n", prog_name);
   exit(255);
 }
 
 int
 main (int argc, char *argv[]) {
-  extern char *optarg;
   int q;
   int do_validation      = 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);
   }
   printf("crypto_kernel successfully initalized\n");
 
   /* process input arguments */
   while (1) {
-    q = getopt(argc, argv, "vd:");
+    q = getopt_s(argc, argv, "vd:");
     if (q == -1) 
       break;
     switch (q) {
     case 'v':
       do_validation = 1;
       break;
     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;
     default:
       usage(argv[0]);
     }    
   }
 
   if (do_validation) {
     printf("checking crypto_kernel status...\n");
@@ skipping 20 matching lines @@
  * of the crypto_kernel
  */
 
 err_status_t
 crypto_kernel_cipher_test(void) {
 
   /* not implemented yet! */
 
   return err_status_ok;
 }