Changeset 5670 for pjproject


Ignore:
Timestamp:
Oct 5, 2017 4:40:20 AM (22 months ago)
Author:
riza
Message:

Close #2050: Enabling AES-GCM when using external libSRTP version 1.x or 2.0.0.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

    r5656 r5670  
    6666#define SRTP_NULL_AUTH                  NULL_AUTH 
    6767#define SRTP_AES_ICM_128                AES_ICM 
     68#define SRTP_AES_ICM_192                AES_ICM 
    6869#define SRTP_AES_ICM_256                AES_ICM 
     70#define SRTP_AES_GCM_128                AES_128_GCM 
     71#define SRTP_AES_GCM_256                AES_256_GCM 
    6972#define SRTP_HMAC_SHA1                  HMAC_SHA1 
     73#define srtp_aes_gcm_256_openssl        aes_gcm_256_openssl 
     74#define srtp_aes_gcm_128_openssl        aes_gcm_128_openssl 
    7075 
    7176#else                                   /* External SRTP 2.x */ 
    7277#  include <srtp2/srtp.h> 
    7378#  include <srtp2/cipher.h> 
     79 
     80/* In libsrtp 2.0.0, the macro SRTP_AES_ICM_128 is not available.  
     81 * Instead it was named with ICM at the end: SRTP_AES_128_ICM.  
     82 */ 
     83#  ifdef SRTP_AES_128_ICM 
     84#    define SRTP_AES_ICM_128            SRTP_AES_128_ICM 
     85#    define SRTP_AES_ICM_192            SRTP_AES_192_ICM 
     86#    define SRTP_AES_ICM_256            SRTP_AES_256_ICM 
     87#    define SRTP_AES_GCM_128            SRTP_AES_128_GCM 
     88#    define SRTP_AES_GCM_256            SRTP_AES_256_GCM 
     89#  endif 
     90 
    7491#endif 
    7592 
Note: See TracChangeset for help on using the changeset viewer.