Unverified Commit 8c48e429 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1767 from timothyklim/srtp_gcm 

Export SRTP_AEAD_AES_128_GCM and SRTP_AEAD_AES_256_GCM to BoringSSL
parents 26d4032c d3e557cf

openssl/src/srtp.rs

+6 −4
Original line number Diff line number Diff line
@@ -46,10 +46,12 @@ impl SrtpProfileId { 
        SrtpProfileId(ffi::SRTP_AES128_F8_SHA1_32 as c_ulong);

    pub const SRTP_NULL_SHA1_80: SrtpProfileId = SrtpProfileId(ffi::SRTP_NULL_SHA1_80 as c_ulong);

    pub const SRTP_NULL_SHA1_32: SrtpProfileId = SrtpProfileId(ffi::SRTP_NULL_SHA1_32 as c_ulong);

    #[cfg(ossl110)]

    pub const SRTP_AEAD_AES_128_GCM: SrtpProfileId = SrtpProfileId(ffi::SRTP_AEAD_AES_128_GCM);

    #[cfg(ossl110)]

    pub const SRTP_AEAD_AES_256_GCM: SrtpProfileId = SrtpProfileId(ffi::SRTP_AEAD_AES_256_GCM);

    #[cfg(any(boringssl, ossl110))]

    pub const SRTP_AEAD_AES_128_GCM: SrtpProfileId =

        SrtpProfileId(ffi::SRTP_AEAD_AES_128_GCM as c_ulong);

    #[cfg(any(boringssl, ossl110))]

    pub const SRTP_AEAD_AES_256_GCM: SrtpProfileId =

        SrtpProfileId(ffi::SRTP_AEAD_AES_256_GCM as c_ulong);



    /// Creates a `SrtpProfileId` from an integer representation.

    pub fn from_raw(value: c_ulong) -> SrtpProfileId {