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

Commit 51a239a3 authored by Jimmy Chen's avatar Jimmy Chen Committed by Android (Google) Code Review
Browse files

Merge "wifi: EAP minimum TLS version API"

parents 68d8f85c 67ebabc6

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/ISupplicantStaNetwork.aidl

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ interface ISupplicantStaNetwork { 
  void setWepKey(in int keyIdx, in byte[] wepKey);

  void setWepTxKeyIdx(in int keyIdx);

  void setRoamingConsortiumSelection(in byte[] selectedRcoi);

  void setMinimumTlsVersionEapPhase1Param(android.hardware.wifi.supplicant.TlsVersion tlsVersion);

  const int SSID_MAX_LEN_IN_BYTES = 32;

  const int PSK_PASSPHRASE_MIN_LEN_IN_BYTES = 8;

  const int PSK_PASSPHRASE_MAX_LEN_IN_BYTES = 63;

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/TlsVersion.aidl

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.wifi.supplicant;

@Backing(type="int") @VintfStability

enum TlsVersion {

  TLS_V1_0 = 0,

  TLS_V1_1 = 1,

  TLS_V1_2 = 2,

  TLS_V1_3 = 3,

}

wifi/supplicant/aidl/aidl_api/android.hardware.wifi.supplicant/current/android/hardware/wifi/supplicant/WpaDriverCapabilitiesMask.aidl

+2 −0
Original line number Diff line number Diff line
@@ -39,4 +39,6 @@ enum WpaDriverCapabilitiesMask { 
  SAE_PK = 4,

  WFD_R2 = 8,

  TRUST_ON_FIRST_USE = 16,

  SET_TLS_MINIMUM_VERSION = 32,

  TLS_V1_3 = 64,

}

wifi/supplicant/aidl/android/hardware/wifi/supplicant/ISupplicantStaNetwork.aidl

+13 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.hardware.wifi.supplicant.OcspType; 
import android.hardware.wifi.supplicant.PairwiseCipherMask;

import android.hardware.wifi.supplicant.ProtoMask;

import android.hardware.wifi.supplicant.SaeH2eMode;

import android.hardware.wifi.supplicant.TlsVersion;



/**

 * Interface exposed by the supplicant for each station mode network
@@ -1118,4 +1119,16 @@ interface ISupplicantStaNetwork { 
     *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|

     */

    void setRoamingConsortiumSelection(in byte[] selectedRcoi);



    /**

     * Set the minimum TLS version for EAP phase1 param.

     *

     * @param tlsVersion the TLS version

     *

     * @throws ServiceSpecificException with one of the following values:

     *         |SupplicantStatusCode.FAILURE_ARGS_INVALID|,

     *         |SupplicantStatusCode.FAILURE_UNKNOWN|,

     *         |SupplicantStatusCode.FAILURE_NETWORK_INVALID|

     */

    void setMinimumTlsVersionEapPhase1Param(TlsVersion tlsVersion);

}

wifi/supplicant/aidl/android/hardware/wifi/supplicant/TlsVersion.aidl

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.hardware.wifi.supplicant;



/**

 * TlsVersion: TLS version.

 */

@VintfStability

@Backing(type="int")

enum TlsVersion {

    TLS_V1_0,

    TLS_V1_1,

    TLS_V1_2,

    TLS_V1_3,

}