Merge "Add AEAD algorithms AES-GCM-8, AES-GCM-12 and AES-GCM-16 to IWLAN" into main (a79b5d1d) · Commits · e / os / android_frameworks_base

core/api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -43688,6 +43688,7 @@ package android.telephony {
		field public static final String KEY_CHILD_SA_REKEY_SOFT_TIMER_SEC_INT = "iwlan.child_sa_rekey_soft_timer_sec_int";
		field public static final String KEY_CHILD_SESSION_AES_CBC_KEY_SIZE_INT_ARRAY = "iwlan.child_session_aes_cbc_key_size_int_array";
		field public static final String KEY_CHILD_SESSION_AES_CTR_KEY_SIZE_INT_ARRAY = "iwlan.child_session_aes_ctr_key_size_int_array";
		field @FlaggedApi("com.android.internal.telephony.flags.enable_aead_algorithms") public static final String KEY_CHILD_SESSION_AES_GCM_KEY_SIZE_INT_ARRAY = "iwlan.child_session_aes_gcm_key_size_int_array";
		field public static final String KEY_DIFFIE_HELLMAN_GROUPS_INT_ARRAY = "iwlan.diffie_hellman_groups_int_array";
		field public static final String KEY_DPD_TIMER_SEC_INT = "iwlan.dpd_timer_sec_int";
		field public static final String KEY_EPDG_ADDRESS_IP_TYPE_PREFERENCE_INT = "iwlan.epdg_address_ip_type_preference_int";
		@@ -43703,12 +43704,15 @@ package android.telephony {
		field public static final String KEY_IKE_REMOTE_ID_TYPE_INT = "iwlan.ike_remote_id_type_int";
		field public static final String KEY_IKE_SESSION_AES_CBC_KEY_SIZE_INT_ARRAY = "iwlan.ike_session_encryption_aes_cbc_key_size_int_array";
		field public static final String KEY_IKE_SESSION_AES_CTR_KEY_SIZE_INT_ARRAY = "iwlan.ike_session_encryption_aes_ctr_key_size_int_array";
		field @FlaggedApi("com.android.internal.telephony.flags.enable_aead_algorithms") public static final String KEY_IKE_SESSION_AES_GCM_KEY_SIZE_INT_ARRAY = "iwlan.ike_session_encryption_aes_gcm_key_size_int_array";
		field public static final String KEY_MAX_RETRIES_INT = "iwlan.max_retries_int";
		field public static final String KEY_MCC_MNCS_STRING_ARRAY = "iwlan.mcc_mncs_string_array";
		field public static final String KEY_NATT_KEEP_ALIVE_TIMER_SEC_INT = "iwlan.natt_keep_alive_timer_sec_int";
		field public static final String KEY_PREFIX = "iwlan.";
		field public static final String KEY_RETRANSMIT_TIMER_MSEC_INT_ARRAY = "iwlan.retransmit_timer_sec_int_array";
		field @FlaggedApi("com.android.internal.telephony.flags.enable_aead_algorithms") public static final String KEY_SUPPORTED_CHILD_SESSION_AEAD_ALGORITHMS_INT_ARRAY = "iwlan.supported_child_session_aead_algorithms_int_array";
		field public static final String KEY_SUPPORTED_CHILD_SESSION_ENCRYPTION_ALGORITHMS_INT_ARRAY = "iwlan.supported_child_session_encryption_algorithms_int_array";
		field @FlaggedApi("com.android.internal.telephony.flags.enable_aead_algorithms") public static final String KEY_SUPPORTED_IKE_SESSION_AEAD_ALGORITHMS_INT_ARRAY = "iwlan.supported_ike_session_aead_algorithms_int_array";
		field public static final String KEY_SUPPORTED_IKE_SESSION_ENCRYPTION_ALGORITHMS_INT_ARRAY = "iwlan.supported_ike_session_encryption_algorithms_int_array";
		field public static final String KEY_SUPPORTED_INTEGRITY_ALGORITHMS_INT_ARRAY = "iwlan.supported_integrity_algorithms_int_array";
		field public static final String KEY_SUPPORTED_PRF_ALGORITHMS_INT_ARRAY = "iwlan.supported_prf_algorithms_int_array";

telephony/java/android/telephony/CarrierConfigManager.java

+54 −0

Original line number	Diff line number	Diff line
		@@ -8874,6 +8874,19 @@ public class CarrierConfigManager {
		public static final String KEY_CHILD_SESSION_AES_CTR_KEY_SIZE_INT_ARRAY =
		KEY_PREFIX + "child_session_aes_ctr_key_size_int_array";

		/**
		* List of supported key sizes for AES Galois/Counter Mode (GCM) encryption mode
		* of child session.
		* Possible values are:
		* {@link android.net.ipsec.ike.SaProposal#KEY_LEN_UNUSED},
		* {@link android.net.ipsec.ike.SaProposal#KEY_LEN_AES_128},
		* {@link android.net.ipsec.ike.SaProposal#KEY_LEN_AES_192},
		* {@link android.net.ipsec.ike.SaProposal#KEY_LEN_AES_256}
		*/
		@FlaggedApi(Flags.FLAG_ENABLE_AEAD_ALGORITHMS)
		public static final String KEY_CHILD_SESSION_AES_GCM_KEY_SIZE_INT_ARRAY =
		KEY_PREFIX + "child_session_aes_gcm_key_size_int_array";

		/**
		* List of supported encryption algorithms for child session. Possible values are
		* {@link android.net.ipsec.ike.SaProposal#ENCRYPTION_ALGORITHM_AES_CBC},
		@@ -8882,6 +8895,16 @@ public class CarrierConfigManager {
		public static final String KEY_SUPPORTED_CHILD_SESSION_ENCRYPTION_ALGORITHMS_INT_ARRAY =
		KEY_PREFIX + "supported_child_session_encryption_algorithms_int_array";

		/**
		* List of supported AEAD algorithms for child session. Possible values are
		* {@link android.net.ipsec.ike.SaProposal#ENCRYPTION_ALGORITHM_AES_GCM_8},
		* {@link android.net.ipsec.ike.SaProposal#ENCRYPTION_ALGORITHM_AES_GCM_12},
		* {@link android.net.ipsec.ike.SaProposal#ENCRYPTION_ALGORITHM_AES_GCM_16}
		*/
		@FlaggedApi(Flags.FLAG_ENABLE_AEAD_ALGORITHMS)
		public static final String KEY_SUPPORTED_CHILD_SESSION_AEAD_ALGORITHMS_INT_ARRAY =
		KEY_PREFIX + "supported_child_session_aead_algorithms_int_array";

		/**
		* Time in seconds after which the IKE session is terminated if rekey procedure is not
		* successful. If not set or set to <= 0, default value is 3600 seconds.
		@@ -8918,6 +8941,19 @@ public class CarrierConfigManager {
		public static final String KEY_IKE_SESSION_AES_CTR_KEY_SIZE_INT_ARRAY =
		KEY_PREFIX + "ike_session_encryption_aes_ctr_key_size_int_array";

		/**
		* List of supported key sizes for AES Galois/Counter Mode (GCM) encryption mode
		* of IKE session.
		* Possible values -
		* {@link android.net.ipsec.ike.SaProposal#KEY_LEN_UNUSED},
		* {@link android.net.ipsec.ike.SaProposal#KEY_LEN_AES_128},
		* {@link android.net.ipsec.ike.SaProposal#KEY_LEN_AES_192},
		* {@link android.net.ipsec.ike.SaProposal#KEY_LEN_AES_256}
		*/
		@FlaggedApi(Flags.FLAG_ENABLE_AEAD_ALGORITHMS)
		public static final String KEY_IKE_SESSION_AES_GCM_KEY_SIZE_INT_ARRAY =
		KEY_PREFIX + "ike_session_encryption_aes_gcm_key_size_int_array";

		/**
		* List of supported encryption algorithms for IKE session. Possible values are
		* {@link android.net.ipsec.ike.SaProposal#ENCRYPTION_ALGORITHM_AES_CBC},
		@@ -8926,6 +8962,16 @@ public class CarrierConfigManager {
		public static final String KEY_SUPPORTED_IKE_SESSION_ENCRYPTION_ALGORITHMS_INT_ARRAY =
		KEY_PREFIX + "supported_ike_session_encryption_algorithms_int_array";

		/**
		* List of supported AEAD algorithms for IKE session. Possible values are
		* {@link android.net.ipsec.ike.SaProposal#ENCRYPTION_ALGORITHM_AES_GCM_8},
		* {@link android.net.ipsec.ike.SaProposal#ENCRYPTION_ALGORITHM_AES_GCM_12},
		* {@link android.net.ipsec.ike.SaProposal#ENCRYPTION_ALGORITHM_AES_GCM_16}
		*/
		@FlaggedApi(Flags.FLAG_ENABLE_AEAD_ALGORITHMS)
		public static final String KEY_SUPPORTED_IKE_SESSION_AEAD_ALGORITHMS_INT_ARRAY =
		KEY_PREFIX + "supported_ike_session_aead_algorithms_int_array";

		/**
		* List of supported integrity algorithms for IKE session. Possible values are
		* {@link android.net.ipsec.ike.SaProposal#INTEGRITY_ALGORITHM_NONE},
		@@ -9155,9 +9201,13 @@ public class CarrierConfigManager {
		defaults.putIntArray(
		KEY_SUPPORTED_IKE_SESSION_ENCRYPTION_ALGORITHMS_INT_ARRAY,
		new int[] {SaProposal.ENCRYPTION_ALGORITHM_AES_CBC});
		defaults.putIntArray(
		KEY_SUPPORTED_IKE_SESSION_AEAD_ALGORITHMS_INT_ARRAY, new int[] {});
		defaults.putIntArray(
		KEY_SUPPORTED_CHILD_SESSION_ENCRYPTION_ALGORITHMS_INT_ARRAY,
		new int[] {SaProposal.ENCRYPTION_ALGORITHM_AES_CBC});
		defaults.putIntArray(
		KEY_SUPPORTED_CHILD_SESSION_AEAD_ALGORITHMS_INT_ARRAY, new int[] {});
		defaults.putIntArray(
		KEY_SUPPORTED_INTEGRITY_ALGORITHMS_INT_ARRAY,
		new int[] {
		@@ -9206,6 +9256,10 @@ public class CarrierConfigManager {
		SaProposal.KEY_LEN_AES_128,
		SaProposal.KEY_LEN_AES_192,
		SaProposal.KEY_LEN_AES_256});
		defaults.putIntArray(
		KEY_IKE_SESSION_AES_GCM_KEY_SIZE_INT_ARRAY, new int[] {});
		defaults.putIntArray(
		KEY_CHILD_SESSION_AES_GCM_KEY_SIZE_INT_ARRAY, new int[] {});
		defaults.putIntArray(
		KEY_EPDG_ADDRESS_PRIORITY_INT_ARRAY,
		new int[] {EPDG_ADDRESS_PLMN, EPDG_ADDRESS_STATIC});