Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3339a65 authored by Gil Cukierman's avatar Gil Cukierman Committed by Android (Google) Code Review
Browse files

Merge "Fix case on SIP HMAC enums" into main

parents 7881e82b d9657be6

radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/SecurityAlgorithm.aidl

+2 −2
Original line number Diff line number Diff line
@@ -64,9 +64,9 @@ enum SecurityAlgorithm { 
  DES_EDE3_CBC = 72,

  AES_EDE3_CBC = 73,

  HMAC_SHA1_96 = 74,

  HMAC_SHA1_96_null = 75,

  HMAC_SHA1_96_NULL = 75,

  HMAC_MD5_96 = 76,

  HMAC_MD5_96_null = 77,

  HMAC_MD5_96_NULL = 77,

  SRTP_AES_COUNTER = 87,

  SRTP_AES_F8 = 88,

  SRTP_HMAC_SHA1 = 89,

radio/aidl/android/hardware/radio/network/SecurityAlgorithm.aidl

+2 −2
Original line number Diff line number Diff line
@@ -67,9 +67,9 @@ enum SecurityAlgorithm { 
    DES_EDE3_CBC = 72,

    AES_EDE3_CBC = 73,

    HMAC_SHA1_96 = 74,

    HMAC_SHA1_96_null = 75,

    HMAC_SHA1_96_NULL = 75,

    HMAC_MD5_96 = 76,

    HMAC_MD5_96_null = 77,

    HMAC_MD5_96_NULL = 77,



    // RTP (see 3GPP TS 33.328)

    SRTP_AES_COUNTER = 87,