commit afd565ff9cb4fe1d20f4aa2ee7339c86998aafae
author Joachim Bauch <jbauch@webrtc.org> Thu Dec 10 23:29:27 2015 +0100
committer David Benjamin <davidben@google.com> Thu Dec 10 23:18:16 2015 +0000
tree 9b0475c8a6f59161b2894532ccb9ac3c5f37ebf4
parent 902870e3b55f6d970d0f956b1571ae18afb2f7fd

Add defines for SRTP profiles using GCM ciphers from RFC 7714.

BUG=webrtc:5222

Change-Id: I8399bd595564dedbe5492b8ea6eb915f41367cbf
Reviewed-on: https://boringssl-review.googlesource.com/6690
Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: David Benjamin <davidben@google.com>

include/openssl/ssl.h

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 7e865ef..9d51c2d 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2429,6 +2429,8 @@
 #define SRTP_AES128_F8_SHA1_32 0x0004
 #define SRTP_NULL_SHA1_80      0x0005
 #define SRTP_NULL_SHA1_32      0x0006
+#define SRTP_AEAD_AES_128_GCM  0x0007
+#define SRTP_AEAD_AES_256_GCM  0x0008
 
 /* SSL_CTX_set_srtp_profiles enables SRTP for all SSL objects created from
  * |ctx|. |profile| contains a colon-separated list of profile names. It returns

ssl/d1_srtp.c

diff --git a/ssl/d1_srtp.c b/ssl/d1_srtp.c
index 115bd70..5dba8ef 100644
--- a/ssl/d1_srtp.c
+++ b/ssl/d1_srtp.c
@@ -133,6 +133,12 @@
     {
         "SRTP_AES128_CM_SHA1_32", SRTP_AES128_CM_SHA1_32,
     },
+    {
+        "SRTP_AEAD_AES_128_GCM", SRTP_AEAD_AES_128_GCM,
+    },
+    {
+        "SRTP_AEAD_AES_256_GCM", SRTP_AEAD_AES_256_GCM,
+    },
     {0, 0},
 };