Update libsrtp to version 2.0

crypto/test/kernel_driver.c

 /*
  * kernel_driver.c
  *
  * a test driver for the crypto_kernel
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  */
 /*
  *      
@@ skipping 43 matching lines @@
 void
 usage(char *prog_name) {
   printf("usage: %s [ -v ][ -d debug_module ]*\n", prog_name);
   exit(255);
 }
 
 int
 main (int argc, char *argv[]) {
   int q;
   int do_validation      = 0;
-  err_status_t status;
+  srtp_err_status_t status;
 
   if (argc == 1)
     usage(argv[0]);
 
   /* initialize kernel - we need to do this before anything else */ 
-  status = crypto_kernel_init();
+  status = srtp_crypto_kernel_init();
   if (status) {
-    printf("error: crypto_kernel init failed\n");
+    printf("error: srtp_crypto_kernel init failed\n");
     exit(1);
   }
-  printf("crypto_kernel successfully initalized\n");
+  printf("srtp_crypto_kernel successfully initalized\n");
 
   /* process input arguments */
   while (1) {
     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_s, 1);
+      status = srtp_crypto_kernel_set_debug_module(optarg_s, 1);
       if (status) {
         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");
-    status = crypto_kernel_status();
+    printf("checking srtp_crypto_kernel status...\n");
+    status = srtp_crypto_kernel_status();
     if (status) {
       printf("failed\n");
       exit(1);
     }
-    printf("crypto_kernel passed self-tests\n");
+    printf("srtp_crypto_kernel passed self-tests\n");
   }
 
-  status = crypto_kernel_shutdown();
+  status = srtp_crypto_kernel_shutdown();
   if (status) {
-    printf("error: crypto_kernel shutdown failed\n");
+    printf("error: srtp_crypto_kernel shutdown failed\n");
     exit(1);
   }
-  printf("crypto_kernel successfully shut down\n");
+  printf("srtp_crypto_kernel successfully shut down\n");
   
   return 0;
 }
 
 /*
  * crypto_kernel_cipher_test() is a test of the cipher interface
  * of the crypto_kernel
  */
 
-err_status_t
+srtp_err_status_t
 crypto_kernel_cipher_test(void) {
 
   /* not implemented yet! */
 
-  return err_status_ok;
+  return srtp_err_status_ok;
 }