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

Commit c91bc62f authored by Jan Nordqvist's avatar Jan Nordqvist Committed by Vinit Deshpande
Browse files

Added setDomSuffixMatch for AAA cert suffix matching. 

Change-Id: I112399d2ce3d940ccf4451477b3b4edb93010b42
parent 6593256e

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -18073,6 +18073,7 @@ package android.net.wifi { 
    method public java.lang.String getAnonymousIdentity();

    method public java.security.cert.X509Certificate getCaCertificate();

    method public java.security.cert.X509Certificate getClientCertificate();

    method public java.lang.String getDomSubjectMatch();

    method public int getEapMethod();

    method public java.lang.String getIdentity();

    method public java.lang.String getPassword();
@@ -18084,6 +18085,7 @@ package android.net.wifi { 
    method public void setAnonymousIdentity(java.lang.String);

    method public void setCaCertificate(java.security.cert.X509Certificate);

    method public void setClientKeyEntry(java.security.PrivateKey, java.security.cert.X509Certificate);

    method public void setDomSuffixMatch(java.lang.String);

    method public void setEapMethod(int);

    method public void setIdentity(java.lang.String);

    method public void setPassword(java.lang.String);

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -19594,6 +19594,7 @@ package android.net.wifi { 
    method public java.lang.String getAnonymousIdentity();

    method public java.security.cert.X509Certificate getCaCertificate();

    method public java.security.cert.X509Certificate getClientCertificate();

    method public java.lang.String getDomSubjectMatch();

    method public int getEapMethod();

    method public java.lang.String getIdentity();

    method public java.lang.String getPassword();
@@ -19605,6 +19606,7 @@ package android.net.wifi { 
    method public void setAnonymousIdentity(java.lang.String);

    method public void setCaCertificate(java.security.cert.X509Certificate);

    method public void setClientKeyEntry(java.security.PrivateKey, java.security.cert.X509Certificate);

    method public void setDomSuffixMatch(java.lang.String);

    method public void setEapMethod(int);

    method public void setIdentity(java.lang.String);

    method public void setPassword(java.lang.String);

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

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

    public static final String ALTSUBJECT_MATCH_KEY = "altsubject_match";

    /** @hide */

    public static final String DOM_SUFFIX_MATCH_KEY = "domain_suffix_match";

    /** @hide */

    public static final String OPP_KEY_CACHING     = "proactive_key_caching";

    /**

     * String representing the keystore OpenSSL ENGINE's ID.
@@ -576,6 +578,36 @@ public class WifiEnterpriseConfig implements Parcelable { 
        return getFieldValue(ALTSUBJECT_MATCH_KEY, "");

    }



    /**

     * Set the domain_suffix_match directive on wpa_supplicant. This is the parameter to use

     * for Hotspot 2.0 defined matching of AAA server certs per WFA HS2.0 spec, section 7.3.3.2,

     * second paragraph.

     *

     * From wpa_supplicant documentation:

     * Constraint for server domain name. If set, this FQDN is used as a suffix match requirement

     * for the AAAserver certificate in SubjectAltName dNSName element(s). If a matching dNSName is

     * found, this constraint is met. If no dNSName values are present, this constraint is matched

     * against SubjectName CN using same suffix match comparison.

     * Suffix match here means that the host/domain name is compared one label at a time starting

     * from the top-level domain and all the labels in domain_suffix_match shall be included in the

     * certificate. The certificate may include additional sub-level labels in addition to the

     * required labels.

     * For example, domain_suffix_match=example.com would match test.example.com but would not

     * match test-example.com.

     * @param domain The domain value

     */

    public void setDomSuffixMatch(String domain) {

        setFieldValue(DOM_SUFFIX_MATCH_KEY, domain);

    }



    /**

     * Get the domain_suffix_match value. See setDomSuffixMatch.

     * @return The domain value.

     */

    public String getDomSubjectMatch() {

        return getFieldValue(DOM_SUFFIX_MATCH_KEY, "");

    }



    /**

     * Set realm for passpoint credential

     * @param realm the realm