Update libsrtp to upstream 1.5.0

srtp/include/srtp_priv.h

 /*
  * srtp_priv.h
  *
  * private internal data structures and functions for libSRTP
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  */
 /*
  *      
@@ skipping 27 matching lines @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #ifndef SRTP_PRIV_H
 #define SRTP_PRIV_H
 
+#include "config.h"
 #include "srtp.h"
 #include "rdbx.h"
 #include "rdb.h"
 #include "integers.h"
+#include "crypto.h"
+#include "cipher.h"
+#include "auth.h"
+#include "aes.h"
+#include "key.h"
+#include "crypto_kernel.h"
+
+#define SRTP_VER_STRING     PACKAGE_STRING
+#define SRTP_VERSION        PACKAGE_VERSION
 
 /*
  * an srtp_hdr_t represents the srtp header
  *
  * in this implementation, an srtp_hdr_t is assumed to be 32-bit aligned
  * 
  * (note that this definition follows that of RFC 1889 Appendix A, but
  * is not identical)
  */
  
@@ skipping 19 matching lines @@
 } srtp_hdr_t;
 
 #else /*  BIG_ENDIAN */
 
 typedef struct {
   unsigned char version:2; /* protocol version    */
   unsigned char p:1;    /* padding flag           */
   unsigned char x:1;    /* header extension flag  */
   unsigned char cc:4;   /* CSRC count             */
   unsigned char m:1;    /* marker bit             */
-  unsigned pt:7;        /* payload type           */
+  unsigned char pt:7;   /* payload type           */
   uint16_t seq;         /* sequence number        */
   uint32_t ts;          /* timestamp              */
   uint32_t ssrc;        /* synchronization source */
 } srtp_hdr_t;
 
 #endif
 
 typedef struct {
   uint16_t profile_specific;    /* profile-specific info               */
   uint16_t length;              /* number of 32-bit words in extension */
@@ skipping 111 matching lines @@
   rdbx_t     rtp_rdbx;
   sec_serv_t rtp_services;
   cipher_t  *rtcp_cipher;
   auth_t    *rtcp_auth;
   rdb_t      rtcp_rdb;
   sec_serv_t rtcp_services;
   key_limit_ctx_t *limit;
   direction_t direction;
   int        allow_repeat_tx;
   ekt_stream_t ekt; 
+  uint8_t    salt[SRTP_AEAD_SALT_LEN];   /* used with GCM mode for SRTP */
+  uint8_t    c_salt[SRTP_AEAD_SALT_LEN]; /* used with GCM mode for SRTCP */
   struct srtp_stream_ctx_t *next;   /* linked list of streams */
 } srtp_stream_ctx_t;
 
 
 /*
  * an srtp_ctx_t holds a stream list and a service description
  */
 
 typedef struct srtp_ctx_t {
   srtp_stream_ctx_t *stream_list;     /* linked list of streams            */
   srtp_stream_ctx_t *stream_template; /* act as template for other streams */
+  void *user_data;                    /* user custom data */
 } srtp_ctx_t;
 
 
 
 /*
  * srtp_handle_event(srtp, srtm, evnt) calls the event handling
  * function, if there is one.
  *
  * This macro is not included in the documentation as it is 
  * an internal-only function.
  */
 
 #define srtp_handle_event(srtp, strm, evnt)         \
    if(srtp_event_handler) {                         \
       srtp_event_data_t data;                       \
       data.session = srtp;                          \
       data.stream  = strm;                          \
       data.event   = evnt;                          \
       srtp_event_handler(&data);                    \
 }   
 
 
 #endif /* SRTP_PRIV_H */