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

Commit e7095d92 authored by Hai Shalom's avatar Hai Shalom
Browse files

[SAE] Remove support for SAE Password identifier from API surface 

Remove support for SAE Password identifier from API surface due to
privacy vulnerabilities that exist in the protocol.

Bug: 150897608
Test: atest WifiConfigurationTest
Test: Manually connect to SAE network without password id
Change-Id: I40ebf7720ee51ddf264d4f256a1a75b03f1a6ca6
parent 4256be1c

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -7240,7 +7240,6 @@ package android.net.wifi { 
    field @Deprecated public int numScorerOverride;

    field @Deprecated public int numScorerOverrideAndSwitchedNetwork;

    field @Deprecated public boolean requirePmf;

    field @Deprecated @Nullable public String saePasswordId;

    field @Deprecated public boolean shared;

    field @Deprecated public boolean useExternalScores;

  }

wifi/java/android/net/wifi/WifiConfiguration.java

+0 −13
Original line number Diff line number Diff line
@@ -634,13 +634,6 @@ public class WifiConfiguration implements Parcelable { 
     */

    public String preSharedKey;



    /**

     * Optional SAE Password Id for use with WPA3-SAE. It is an ASCII string.

     * @hide

     */

    @SystemApi

    public @Nullable String saePasswordId;



    /**

     * Four WEP keys. For each of the four values, provide either an ASCII

     * string enclosed in double quotation marks (e.g., {@code "abcdef"}),
@@ -2334,9 +2327,6 @@ public class WifiConfiguration implements Parcelable { 
            sbuf.append('*');

        }



        sbuf.append('\n').append(" SAE Password Id: ");

        sbuf.append(this.saePasswordId);



        sbuf.append("\nEnterprise config:\n");

        sbuf.append(enterpriseConfig);
@@ -2731,7 +2721,6 @@ public class WifiConfiguration implements Parcelable { 
            providerFriendlyName = source.providerFriendlyName;

            isHomeProviderNetwork = source.isHomeProviderNetwork;

            preSharedKey = source.preSharedKey;

            saePasswordId = source.saePasswordId;



            mNetworkSelectionStatus.copy(source.getNetworkSelectionStatus());

            apBand = source.apBand;
@@ -2819,7 +2808,6 @@ public class WifiConfiguration implements Parcelable { 
            dest.writeLong(roamingConsortiumId);

        }

        dest.writeString(preSharedKey);

        dest.writeString(saePasswordId);

        for (String wepKey : wepKeys) {

            dest.writeString(wepKey);

        }
@@ -2895,7 +2883,6 @@ public class WifiConfiguration implements Parcelable { 
                    config.roamingConsortiumIds[i] = in.readLong();

                }

                config.preSharedKey = in.readString();

                config.saePasswordId = in.readString();

                for (int i = 0; i < config.wepKeys.length; i++) {

                    config.wepKeys[i] = in.readString();

                }