Update libsrtp to version 2.0

crypto/test/kernel_driver.c

Index: crypto/test/kernel_driver.c
diff --git a/srtp/crypto/test/kernel_driver.c b/crypto/test/kernel_driver.c
similarity index 82%
rename from srtp/crypto/test/kernel_driver.c
rename to crypto/test/kernel_driver.c
index 188637cdc1a8af2dab08eda13a64381348ab2c8c..4254d79c5c657cfa379b0c6221365a56607d84e4 100644
--- a/srtp/crypto/test/kernel_driver.c
+++ b/crypto/test/kernel_driver.c
@@ -61,18 +61,18 @@ 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) {
@@ -84,7 +84,7 @@ main (int argc, char *argv[]) {
       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);
@@ -96,21 +96,21 @@ main (int argc, char *argv[]) {
   }
 
   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;
 }
@@ -120,10 +120,10 @@ main (int argc, char *argv[]) {
  * 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;
 }