[openssl-commits] [openssl] master update
Matt Caswell
matt at openssl.org
Thu Feb 4 22:55:47 UTC 2016
The branch master has been updated
via 43e5faa2539ae8aae6ef55be2239b9b1a77fea45 (commit)
from b7be6d2290261d9c5d5714549e03ec44df4a9fa1 (commit)
- Log -----------------------------------------------------------------
commit 43e5faa2539ae8aae6ef55be2239b9b1a77fea45
Author: Dmitry Sobinov <sobinoff at gmail.com>
Date: Sat Jan 2 22:32:36 2016 +1100
Add new DTLS-SRTP protection profiles from RFC 7714
Reviewed-by: Kurt Roeckx <kurt at openssl.org>
Reviewed-by: Matt Caswell <matt at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
include/openssl/srtp.h | 4 ++++
ssl/d1_srtp.c | 8 ++++++++
2 files changed, 12 insertions(+)
diff --git a/include/openssl/srtp.h b/include/openssl/srtp.h
index 1f5aed2..da9369e 100644
--- a/include/openssl/srtp.h
+++ b/include/openssl/srtp.h
@@ -129,6 +129,10 @@ extern "C" {
# define SRTP_NULL_SHA1_80 0x0005
# define SRTP_NULL_SHA1_32 0x0006
+/* AEAD SRTP protection profiles from RFC 7714 */
+# define SRTP_AEAD_AES_128_GCM 0x0007
+# define SRTP_AEAD_AES_256_GCM 0x0008
+
# ifndef OPENSSL_NO_SRTP
__owur int SSL_CTX_set_tlsext_use_srtp(SSL_CTX *ctx, const char *profiles);
diff --git a/ssl/d1_srtp.c b/ssl/d1_srtp.c
index 587a592..f969fb1 100644
--- a/ssl/d1_srtp.c
+++ b/ssl/d1_srtp.c
@@ -128,6 +128,14 @@ static SRTP_PROTECTION_PROFILE srtp_known_profiles[] = {
"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}
};
More information about the openssl-commits
mailing list