Update libsrtp to version 2.0

crypto/test/auth_driver.c

 /*
  * auth_driver.c
  *
  * a driver for auth functions
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  */
 
 /*
@@ skipping 35 matching lines @@
 
 #include <stdio.h>    /* for printf() */
 #include <stdlib.h>   /* for xalloc() */
 #include <unistd.h>   /* for getopt() */
 
 #include "auth.h"
 #include "null_auth.h"
 
 #define PRINT_DEBUG_DATA 0
 
-extern auth_type_t tmmhv2;
+extern srtp_auth_type_t tmmhv2;
 
 const uint16_t msg0[9] = {
   0x6015, 0xf141, 0x5ba1, 0x29a0, 0xf604, 0xd1c, 0x2d9, 0xaa8a, 0x7931
 };
 
 /* key1 is for TAG_WORDS = 2 */
 
 const uint16_t key1[47] = {
   0xe627, 0x6a01, 0x5ea7, 0xf27a, 0xc536, 0x2192, 0x11be, 0xea35,
   0xdb9d, 0x63d6, 0xfa8a, 0xfc45, 0xe08b, 0xd216, 0xced2, 0x7853,
@@ skipping 89 matching lines @@
     
   }
 
   return 0;
 }
 
 #define NUM_TRIALS 100000
 
 #include <time.h>
 
-double
-auth_bits_per_second(auth_t *a, int msg_len_octets) {
+double auth_bits_per_second(auth_t *a, int msg_len_octets) {
   int i;
   clock_t timer;
   uint8_t *result;
   int msg_len = (msg_len_octets + 1)/2;
   uint16_t *msg_string; 
 
   /* create random message */
-  msg_string = (uint16_t *) crypto_alloc(msg_len_octets);
+  msg_string = (uint16_t *) srtp_crypto_alloc(msg_len_octets);
   if (msg_string == NULL)
     return 0.0; /* indicate failure */  
   for (i=0; i < msg_len; i++) 
     msg_string[i] = (uint16_t) random();
 
   /* allocate temporary storage for authentication tag */
-  result = crypto_alloc(auth_get_tag_length(a));
+  result = srtp_crypto_alloc(auth_get_tag_length(a));
   if (result == NULL) {
-    free(msg_string);
+    srtp_crypto_free(msg_string);
     return 0.0; /* indicate failure */  
   }
   
   timer = clock();
   for (i=0; i < NUM_TRIALS; i++) {
     auth_compute(a, (uint8_t *)msg_string, msg_len_octets, (uint8_t *)result);
   }
   timer = clock() - timer;
 
-  free(msg_string);
-  free(result);
+  srtp_crypto_free(msg_string);
+  srtp_crypto_free(result);
   
   return (double) NUM_TRIALS * 8 * msg_len_octets * CLOCKS_PER_SEC / timer;
 }