Update libsrtp to version 2.0

crypto/include/datatypes.h

Index: crypto/include/datatypes.h
diff --git a/srtp/crypto/include/datatypes.h b/crypto/include/datatypes.h
similarity index 89%
rename from srtp/crypto/include/datatypes.h
rename to crypto/include/datatypes.h
index e0e3186d304c8e89427ab616ce2687abab56799d..aebffc9e94ccfb3c98a562d8b4d9eb1ad37778c6 100644
--- a/srtp/crypto/include/datatypes.h
+++ b/crypto/include/datatypes.h
@@ -52,21 +52,17 @@
 
 #include <stdarg.h>
 
-#ifndef SRTP_KERNEL
-# include <stdio.h>
-# include <string.h>
-# include <time.h>
-# ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-# elif defined HAVE_WINSOCK2_H
-#  include <winsock2.h>
-# elif defined HAVE_BYTESWAP_METHODS_H
-#  include <stdlib.h>
-#  define ntohl(x) _byteswap_ulong (x)
-#  define ntohs(x) _byteswap_ushort (x)
-#  define htonl(x) _byteswap_ulong (x)
-#  define htons(x) _byteswap_ushort (x)
-# endif
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#elif defined HAVE_WINSOCK2_H
+# include <winsock2.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
 #endif
 
 
@@ -121,13 +117,10 @@ typedef union {
 int
 octet_get_weight(uint8_t octet);
 
-char *
-octet_bit_string(uint8_t x);
-
 #define MAX_PRINT_STRING_LEN 1024
 
 char *
-octet_string_hex_string(const void *str, int length);
+srtp_octet_string_hex_string(const void *str, int length);
 
 char *
 v128_bit_string(v128_t *x);
@@ -135,34 +128,6 @@ v128_bit_string(v128_t *x);
 char *
 v128_hex_string(v128_t *x);
 
-uint8_t
-nibble_to_hex_char(uint8_t nibble);
-
-char *
-char_to_hex_string(char *x, int num_char);
-
-uint8_t
-hex_string_to_octet(char *s);
-
-/*
- * hex_string_to_octet_string(raw, hex, len) converts the hexadecimal
- * string at *hex (of length len octets) to the equivalent raw data
- * and writes it to *raw.
- *
- * if a character in the hex string that is not a hexadeciaml digit
- * (0123456789abcdefABCDEF) is encountered, the function stops writing
- * data to *raw
- *
- * the number of hex digits copied (which is two times the number of
- * octets in *raw) is returned
- */
-
-int
-hex_string_to_octet_string(char *raw, char *hex, int len);
-
-v128_t
-hex_string_to_v128(char *s);
-
 void
 v128_copy_octet_string(v128_t *x, const uint8_t s[16]);
 
@@ -378,8 +343,10 @@ v128_set_bit_to(v128_t *x, int i, int y);
 #endif /* DATATYPES_USE_MACROS */
 
 /*
- * octet_string_is_eq(a,b, len) returns 1 if the length len strings a
- * and b are not equal, returns 0 otherwise
+ * octet_string_is_eq(a, b, len) returns 1 if the length len strings a
+ * and b are not equal. It returns 0 otherwise. The running time of the
+ * comparison depends only on len, making this safe to use for (e.g.)
+ * verifying authentication tags.
  */
 
 int
@@ -389,7 +356,7 @@ void
 octet_string_set_to_zero(uint8_t *s, int len);
 
 
-#if !defined(SRTP_KERNEL_LINUX) && defined(HAVE_CONFIG_H) 
+#if defined(HAVE_CONFIG_H) 
 
 /* 
  * Convert big endian integers to CPU byte order.
@@ -432,7 +399,7 @@ static inline uint64_t be64_to_cpu(uint64_t v) {
    return v;
 }
 
-#endif /* ! SRTP_KERNEL_LINUX */
+#endif 
 
 #endif /* WORDS_BIGENDIAN */
 
@@ -515,8 +482,8 @@ bitvector_left_shift(bitvector_t *x, int index);
 char *
 bitvector_bit_string(bitvector_t *x, char* buf, int len);
 
-#ifdef TESTAPP_SOURCE
-int base64_string_to_octet_string(char *raw, int *pad, char *base64, int len);
+#ifdef __cplusplus
+}
 #endif
 
 #endif /* _DATATYPES_H */