Update libsrtp to version 2.0

test/replay_driver.c

 /*
  * replay_driver.c
  *
  * A driver for the replay_database implementation
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  */
 
 /*
@@ skipping 41 matching lines @@
 #include "rdb.h"
 #include "ut_sim.h"
 
 /*
  * num_trials defines the number of trials that are used in the
  * validation functions below
  */
 
 unsigned num_trials = 1 << 16;
 
-err_status_t
+srtp_err_status_t
 test_rdb_db(void);
 
 double
 rdb_check_adds_per_second(void);
 
 int
 main (void) {
-  err_status_t err;
+  srtp_err_status_t err;
   
-  printf("testing anti-replay database (rdb_t)...\n");
+  printf("testing anti-replay database (srtp_rdb_t)...\n");
   err = test_rdb_db();
   if (err) {
     printf("failed\n");
     exit(1);
   }
   printf("done\n");
 
   printf("rdb_check/rdb_adds per second: %e\n",
          rdb_check_adds_per_second());
   
   return 0;
 }
 
 
 void
-print_rdb(rdb_t *rdb) {
+print_rdb(srtp_rdb_t *rdb) {
   printf("rdb: {%u, %s}\n", rdb->window_start, v128_bit_string(&rdb->bitmask));
 }
 
-err_status_t
-rdb_check_add(rdb_t *rdb, uint32_t idx) {
+srtp_err_status_t
+rdb_check_add(srtp_rdb_t *rdb, uint32_t idx) {
 
-  if (rdb_check(rdb, idx) != err_status_ok) {
+  if (srtp_rdb_check(rdb, idx) != srtp_err_status_ok) {
     printf("rdb_check failed at index %u\n", idx);
-    return err_status_fail;
+    return srtp_err_status_fail;
   }
-  if (rdb_add_index(rdb, idx) != err_status_ok) {
+  if (srtp_rdb_add_index(rdb, idx) != srtp_err_status_ok) {
     printf("rdb_add_index failed at index %u\n", idx);
-    return err_status_fail;
+    return srtp_err_status_fail;
   }
 
-  return err_status_ok;
+  return srtp_err_status_ok;
 }
 
-err_status_t
-rdb_check_expect_failure(rdb_t *rdb, uint32_t idx) {
-  err_status_t err;
+srtp_err_status_t
+rdb_check_expect_failure(srtp_rdb_t *rdb, uint32_t idx) {
+  srtp_err_status_t err;
   
-  err = rdb_check(rdb, idx);
-  if ((err != err_status_replay_old) && (err != err_status_replay_fail)) {
+  err = srtp_rdb_check(rdb, idx);
+  if ((err != srtp_err_status_replay_old) && (err != srtp_err_status_replay_fail)) {
     printf("rdb_check failed at index %u (false positive)\n", idx);
-    return err_status_fail;
+    return srtp_err_status_fail;
   }
 
-  return err_status_ok;
+  return srtp_err_status_ok;
 }
 
-err_status_t
-rdb_check_add_unordered(rdb_t *rdb, uint32_t idx) {
-  err_status_t rstat;
+srtp_err_status_t
+rdb_check_add_unordered(srtp_rdb_t *rdb, uint32_t idx) {
+  srtp_err_status_t rstat;
 
  /* printf("index: %u\n", idx); */
-  rstat = rdb_check(rdb, idx);
-  if ((rstat != err_status_ok) && (rstat != err_status_replay_old)) {
+  rstat = srtp_rdb_check(rdb, idx);
+  if ((rstat != srtp_err_status_ok) && (rstat != srtp_err_status_replay_old)) {
     printf("rdb_check_add_unordered failed at index %u\n", idx);
     return rstat;
   }
-  if (rstat == err_status_replay_old) {
-        return err_status_ok;
+  if (rstat == srtp_err_status_replay_old) {
+        return srtp_err_status_ok;
   }
-  if (rdb_add_index(rdb, idx) != err_status_ok) {
+  if (srtp_rdb_add_index(rdb, idx) != srtp_err_status_ok) {
     printf("rdb_add_index failed at index %u\n", idx);
-    return err_status_fail;
+    return srtp_err_status_fail;
   }  
 
-  return err_status_ok;
+  return srtp_err_status_ok;
 }
 
-err_status_t
+srtp_err_status_t
 test_rdb_db() {
-  rdb_t rdb;
+  srtp_rdb_t rdb;
   uint32_t idx, ircvd;
   ut_connection utc;
-  err_status_t err;
+  srtp_err_status_t err;
 
-  if (rdb_init(&rdb) != err_status_ok) {
+  if (srtp_rdb_init(&rdb) != srtp_err_status_ok) {
     printf("rdb_init failed\n");
-    return err_status_init_fail;
+    return srtp_err_status_init_fail;
   }
 
   /* test sequential insertion */
   for (idx=0; idx < num_trials; idx++) {
     err = rdb_check_add(&rdb, idx);
     if (err) 
       return err;
   }
 
   /* test for false positives */
   for (idx=0; idx < num_trials; idx++) {
     err = rdb_check_expect_failure(&rdb, idx);
     if (err) 
       return err;
   }
 
   /* re-initialize */
-  if (rdb_init(&rdb) != err_status_ok) {
+  if (srtp_rdb_init(&rdb) != srtp_err_status_ok) {
     printf("rdb_init failed\n");
-    return err_status_fail;
+    return srtp_err_status_fail;
   }
 
   /* test non-sequential insertion */
   ut_init(&utc);
   
   for (idx=0; idx < num_trials; idx++) {
     ircvd = ut_next_index(&utc);
     err = rdb_check_add_unordered(&rdb, ircvd);
     if (err) 
       return err;
     err = rdb_check_expect_failure(&rdb, ircvd);
     if (err) 
       return err;
   }
 
   /* re-initialize */
-  if (rdb_init(&rdb) != err_status_ok) {
+  if (srtp_rdb_init(&rdb) != srtp_err_status_ok) {
     printf("rdb_init failed\n");
-    return err_status_fail;
+    return srtp_err_status_fail;
   }
 
   /* test insertion with large gaps */
   for (idx=0, ircvd=0; idx < num_trials; idx++, ircvd += (1 << (rand() % 10))) {
     err = rdb_check_add(&rdb, ircvd);
     if (err)
       return err;
     err = rdb_check_expect_failure(&rdb, ircvd);
     if (err)
       return err;
   }
 
   /* re-initialize */
-  if (rdb_init(&rdb) != err_status_ok) {
+  if (srtp_rdb_init(&rdb) != srtp_err_status_ok) {
     printf("rdb_init failed\n");
-    return err_status_fail;
+    return srtp_err_status_fail;
   }
 
   /* test loss of first 513 packets */
   for (idx=0; idx < num_trials; idx++) {
     err = rdb_check_add(&rdb, idx + 513);
     if (err) 
       return err;
   }
 
   /* test for false positives */
   for (idx=0; idx < num_trials + 513; idx++) {
     err = rdb_check_expect_failure(&rdb, idx);
     if (err) 
       return err;
   }
 
 
-  return err_status_ok;
+  return srtp_err_status_ok;
 }
 
 #include <time.h>       /* for clock()  */
 #include <stdlib.h>     /* for random() */
 
 #define REPLAY_NUM_TRIALS 10000000
 
 double
 rdb_check_adds_per_second(void) {
   uint32_t i;
-  rdb_t rdb;
+  srtp_rdb_t rdb;
   clock_t timer;
   int failures = 0;                    /* count number of failures        */
   
-  if (rdb_init(&rdb) != err_status_ok) {
+  if (srtp_rdb_init(&rdb) != srtp_err_status_ok) {
     printf("rdb_init failed\n");
     exit(1);
   }  
 
   timer = clock();
   for(i=0; i < REPLAY_NUM_TRIALS; i+=3) {
-    if (rdb_check(&rdb, i+2) != err_status_ok)
+    if (srtp_rdb_check(&rdb, i+2) != srtp_err_status_ok)
       ++failures;
-    if (rdb_add_index(&rdb, i+2) != err_status_ok)
+    if (srtp_rdb_add_index(&rdb, i+2) != srtp_err_status_ok)
       ++failures;
-    if (rdb_check(&rdb, i+1) != err_status_ok)
+    if (srtp_rdb_check(&rdb, i+1) != srtp_err_status_ok)
       ++failures;
-    if (rdb_add_index(&rdb, i+1) != err_status_ok)
+    if (srtp_rdb_add_index(&rdb, i+1) != srtp_err_status_ok)
       ++failures;
-    if (rdb_check(&rdb, i) != err_status_ok)
+    if (srtp_rdb_check(&rdb, i) != srtp_err_status_ok)
       ++failures;
-    if (rdb_add_index(&rdb, i) != err_status_ok)
+    if (srtp_rdb_add_index(&rdb, i) != srtp_err_status_ok)
       ++failures;
   }
   timer = clock() - timer;
 
   return (double) CLOCKS_PER_SEC * REPLAY_NUM_TRIALS / timer;
 }