Update libsrtp to upstream 1.5.0

srtp/crypto/include/datatypes.h

 /*
  * datatypes.h
  * 
  * data types for bit vectors and finite fields
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  */
 
 /*
@@ skipping 52 matching lines @@
 # 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
 #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;
 
 typedef union {
   uint8_t  v8[4];
   uint16_t v16[2];
   uint32_t value;
 } v32_t;
 
 typedef union {
   uint8_t  v8[8];
   uint16_t v16[4];
   uint32_t v32[2];
   uint64_t value;
 } v64_t;
 
 typedef union {
   uint8_t  v8[16];
   uint16_t v16[8];
   uint32_t v32[4];
   uint64_t v64[2];
 } v128_t;
 
+typedef union {
+    uint8_t v8[32];
+    uint16_t v16[16];
+    uint32_t v32[8];
+    uint64_t v64[4];
+} v256_t;
 
 
 /* some useful and simple math functions */
 
 #define pow_2(X) ( (unsigned int)1 << (X) )   /* 2^X     */
 
 #define pow_minus_one(X) ( (X) ? -1 : 1 )      /* (-1)^X  */
 
 
 /*
@@ skipping 265 matching lines @@
  * and b are not equal, returns 0 otherwise
  */
 
 int
 octet_string_is_eq(uint8_t *a, uint8_t *b, int len);
 
 void
 octet_string_set_to_zero(uint8_t *s, int len);
 
 
-#ifndef SRTP_KERNEL_LINUX
+#if !defined(SRTP_KERNEL_LINUX) //&& 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 */
 # include <byteswap.h>
 # define be32_to_cpu(x) bswap_32((x))
 # define be64_to_cpu(x) bswap_64((x))
 #else
 
 #if defined(__GNUC__) && defined(HAVE_X86)
 /* Fall back. */
-static INLINE uint32_t be32_to_cpu(uint32_t v) {
+static inline uint32_t be32_to_cpu(uint32_t v) {
    /* optimized for x86. */
    asm("bswap %0" : "=r" (v) : "0" (v));
    return v;
 }
 # else /* HAVE_X86 */
 #  ifdef HAVE_NETINET_IN_H
 #   include <netinet/in.h>
 #  elif defined HAVE_WINSOCK2_H
 #   include <winsock2.h>
 #  endif
 #  define be32_to_cpu(x)        ntohl((x))
 # endif /* HAVE_X86 */
 
-static INLINE uint64_t be64_to_cpu(uint64_t v) {
+static inline uint64_t be64_to_cpu(uint64_t v) {
 # 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;
 }
 
@@ skipping 73 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);
+#endif
+
 #endif /* _DATATYPES_H */