Changeset 5261 for pjproject/trunk/third_party/srtp/include/srtp_priv.h

Timestamp:

Mar 15, 2016 3:57:39 AM (8 years ago)

Author:

nanang

Message:

Close #1847: Upgraded libsrtp version to 1.5.4 and added support for AES-CM-256 crypto.

File:

• pjproject/trunk/third_party/srtp/include/srtp_priv.h (modified) (9 diffs)

pjproject/trunk/third_party/srtp/include/srtp_priv.h

@@ -46 +46 @@
 #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
 
 /*
@@ -60 +70 @@
  */
  
-#ifdef _MSC_VER
-#   pragma warning(push)
-#   pragma warning(disable:4214) // bit field types other than int
-#endif
-
 #ifndef WORDS_BIGENDIAN
 
@@ -73 +78 @@
  * fully pack the bit fields.
  */
+
 typedef struct {
   unsigned char cc:4;   /* CSRC count             */
@@ -93 +99 @@
   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              */
@@ -100 +106 @@
 
 #endif
-
 
 typedef struct {
@@ -163 +168 @@
 
 
-#ifdef _MSC_VER
-#   pragma warning( pop ) 
-#endif
-
-
 /*
  * the following declarations are libSRTP internal functions 
@@ -189 +189 @@
 err_status_t
 srtp_stream_init_keys(srtp_stream_t srtp, const void *key);
+
+/*
+ * srtp_stream_init(s, p) initializes the srtp_stream_t s to 
+ * use the policy at the location p
+ */
+err_status_t
+srtp_stream_init(srtp_stream_t srtp, 
+                 const srtp_policy_t *p);
+
 
 /*
@@ -220 +229 @@
   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;
@@ -231 +244 @@
   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;