Update libsrtp to version 2.0

test/rtp.c

Index: test/rtp.c
diff --git a/srtp/test/rtp.c b/test/rtp.c
similarity index 96%
rename from srtp/test/rtp.c
rename to test/rtp.c
index 20c50f4663b2cfb328efc2e6c3a80a570159ef28..59196fdbdf5ecfe1c9392e999d79d12a290d18ba 100644
--- a/srtp/test/rtp.c
+++ b/test/rtp.c
@@ -59,7 +59,7 @@
 int
 rtp_sendto(rtp_sender_t sender, const void* msg, int len) {
   int octets_sent;
-  err_status_t stat;
+  srtp_err_status_t stat;
   int pkt_len = len + RTP_HEADER_LEN;
 
   /* marshal data */
@@ -99,7 +99,7 @@ rtp_sendto(rtp_sender_t sender, const void* msg, int len) {
 int
 rtp_recvfrom(rtp_receiver_t receiver, void *msg, int *len) {
   int octets_recvd;
-  err_status_t stat;
+  srtp_err_status_t stat;
   
   octets_recvd = recvfrom(receiver->socket, (void *)&receiver->message,
 			 *len, 0, (struct sockaddr *) NULL, 0);
@@ -129,8 +129,8 @@ rtp_recvfrom(rtp_receiver_t receiver, void *msg, int *len) {
   if (stat) {
     fprintf(stderr,
 	    "error: srtp unprotection failed with code %d%s\n", stat,
-	    stat == err_status_replay_fail ? " (replay check failed)" :
-	    stat == err_status_auth_fail ? " (auth check failed)" : "");
+	    stat == srtp_err_status_replay_fail ? " (replay check failed)" :
+	    stat == srtp_err_status_auth_fail ? " (auth check failed)" : "");
     return -1;
   }
   strncpy(msg, receiver->message.body, octets_recvd);