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

Commit c6905acf authored by Samuel Tan's avatar Samuel Tan Committed by android-build-merger
Browse files

Merge "WifiEnterpriseConfig: allow getting and setting of ca_path" into... 

Merge "WifiEnterpriseConfig: allow getting and setting of ca_path" into mm-wireless-dev am: 86293907
am: eddbff07

* commit 'eddbff07':
  WifiEnterpriseConfig: allow getting and setting of ca_path
parents f63fa975 eddbff07

wifi/java/android/net/wifi/WifiEnterpriseConfig.java

+29 −0
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ public class WifiEnterpriseConfig implements Parcelable { 
    /** @hide */

    public static final String CA_CERT_KEY         = "ca_cert";

    /** @hide */

    public static final String CA_PATH_KEY         = "ca_path";

    /** @hide */

    public static final String ENGINE_KEY          = "engine";

    /** @hide */

    public static final String ENGINE_ID_KEY       = "engine_id";
@@ -625,6 +627,33 @@ public class WifiEnterpriseConfig implements Parcelable { 
        mCaCerts = null;

    }



    /**

     * Set the ca_path directive on wpa_supplicant.

     *

     * From wpa_supplicant documentation:

     *

     * Directory path for CA certificate files (PEM). This path may contain

     * multiple CA certificates in OpenSSL format. Common use for this is to

     * point to system trusted CA list which is often installed into directory

     * like /etc/ssl/certs. If configured, these certificates are added to the

     * list of trusted CAs. ca_cert may also be included in that case, but it is

     * not required.

     * @param domain The path for CA certificate files

     * @hide

     */

    public void setCaPath(String path) {

        setFieldValue(CA_PATH_KEY, path);

    }



    /**

     * Get the domain_suffix_match value. See setDomSuffixMatch.

     * @return The path for CA certificate files.

     * @hide

     */

    public String getCaPath() {

        return getFieldValue(CA_PATH_KEY, "");

    }



    /** Set Client certificate alias.

     *

     * <p> See the {@link android.security.KeyChain} for details on installing or choosing