diff options
| author | Dmitry Sobinov <sobinoff@gmail.com> | 2016-01-02 22:32:36 +1100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-02-04 22:52:21 +0000 |
| commit | 43e5faa2539ae8aae6ef55be2239b9b1a77fea45 (patch) | |
| tree | 3d5063486cb41b6f4f807eb2f2c81ac8e9120959 | |
| parent | b7be6d2290261d9c5d5714549e03ec44df4a9fa1 (diff) | |
Add new DTLS-SRTP protection profiles from RFC 7714
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
| -rw-r--r-- | include/openssl/srtp.h | 4 | ||||
| -rw-r--r-- | ssl/d1_srtp.c | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/include/openssl/srtp.h b/include/openssl/srtp.h index 1f5aed21ff..da9369ec2e 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 587a592e82..f969fb10b1 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} }; |