Update libsrtp to version 2.0

crypto/include/datatypes.h

 /*
  * datatypes.h
  * 
  * data types for bit vectors and finite fields
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  */
 
 /*
@@ skipping 34 matching lines @@
 
 
 #ifndef _DATATYPES_H
 #define _DATATYPES_H
 
 #include "integers.h"           /* definitions of uint32_t, et cetera   */
 #include "alloc.h"
 
 #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
 
 
 /* if DATATYPES_USE_MACROS is defined, then little functions are macros */
 #define DATATYPES_USE_MACROS  
 
 typedef union {
   uint8_t  v8[2];
   uint16_t value;
 } v16_t;
@@ skipping 34 matching lines @@
 
 
 /*
  * octet_get_weight(x) returns the hamming weight (number of bits equal to
  * one) in the octet x
  */
 
 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);
 
 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]);
 
 void
 v128_left_shift(v128_t *x, int shift_index);
 
 void
 v128_right_shift(v128_t *x, int shift_index);
 
 /*
@@ skipping 195 matching lines @@
 
 void
 v128_clear_bit(v128_t *x, int i);    
 
 void
 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
 octet_string_is_eq(uint8_t *a, uint8_t *b, int len);
 
 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.
  */
 #ifdef WORDS_BIGENDIAN
 /* Nothing to do. */
 # define be32_to_cpu(x) (x)
 # define be64_to_cpu(x) (x)
 #elif defined(HAVE_BYTESWAP_H)
 /* We have (hopefully) optimized versions in byteswap.h */
@@ skipping 22 matching lines @@
 # ifdef NO_64BIT_MATH
    /* use the make64 functions to do 64-bit math */
    v = make64(htonl(low32(v)),htonl(high32(v)));
 # else
    /* use the native 64-bit math */
    v= (uint64_t)((be32_to_cpu((uint32_t)(v >> 32))) | (((uint64_t)be32_to_cpu((uint32_t)v)) << 32));
 # endif
    return v;
 }
 
-#endif /* ! SRTP_KERNEL_LINUX */
+#endif 
 
 #endif /* WORDS_BIGENDIAN */
 
 /*
  * functions manipulating bitvector_t 
  *
  * A bitvector_t consists of an array of words and an integer
  * representing the number of significant bits stored in the array.
  * The bits are packed as follows: the least significant bit is that
  * of word[0], while the most significant bit is the nth most
@@ skipping 62 matching lines @@
 
 void
 bitvector_set_to_zero(bitvector_t *x);
 
 void
 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 */