wifi: hotspot2: initial implementation of PasspointConfiguration (e557c35d) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.aidl

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2016, 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.net.wifi.hotspot2;

		parcelable PasspointConfiguration;

wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java

0 → 100644

+78 −0

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2016, 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.net.wifi.hotspot2;

		import android.net.wifi.hotspot2.pps.Credential;
		import android.net.wifi.hotspot2.pps.HomeSP;
		import android.os.Parcelable;
		import android.os.Parcel;

		/**
		* Class representing Passpoint configuration. This contains configurations specified in
		* PerProviderSubscription (PPS) Management Object (MO) tree.
		*
		* For more info, refer to Hotspot 2.0 PPS MO defined in section 9.1 of the Hotspot 2.0
		* Release 2 Technical Specification.
		*
		* Currently, only HomeSP and Credential subtrees are supported.
		*
		* @hide
		*/
		public final class PasspointConfiguration implements Parcelable {
		public HomeSP homeSp = null;
		public Credential credential = null;

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeParcelable(homeSp, flags);
		dest.writeParcelable(credential, flags);
		}

		@Override
		public boolean equals(Object thatObject) {
		if (this == thatObject) {
		return true;
		}
		if (!(thatObject instanceof PasspointConfiguration)) {
		return false;
		}
		PasspointConfiguration that = (PasspointConfiguration) thatObject;
		return (homeSp == null ? that.homeSp == null : homeSp.equals(that.homeSp)) &&
		(credential == null ? that.credential == null :
		credential.equals(that.credential));
		}

		public static final Creator<PasspointConfiguration> CREATOR =
		new Creator<PasspointConfiguration>() {
		@Override
		public PasspointConfiguration createFromParcel(Parcel in) {
		PasspointConfiguration config = new PasspointConfiguration();
		config.homeSp = in.readParcelable(null);
		config.credential = in.readParcelable(null);
		return config;
		}
		@Override
		public PasspointConfiguration[] newArray(int size) {
		return new PasspointConfiguration[size];
		}
		};
		}

wifi/java/android/net/wifi/hotspot2/pps/Credential.aidl

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2016, 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.net.wifi.hotspot2.pps;

		parcelable Credential;

wifi/java/android/net/wifi/hotspot2/pps/Credential.java

0 → 100644

+376 −0

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2016, 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.net.wifi.hotspot2.pps;

		import android.net.wifi.ParcelUtil;
		import android.os.Parcelable;
		import android.os.Parcel;
		import android.text.TextUtils;

		import java.security.PrivateKey;
		import java.security.cert.CertificateEncodingException;
		import java.security.cert.X509Certificate;
		import java.util.Arrays;

		/**
		* Class representing Credential subtree in the PerProviderSubscription (PPS)
		* Management Object (MO) tree.
		* For more info, refer to Hotspot 2.0 PPS MO defined in section 9.1 of the Hotspot 2.0
		* Release 2 Technical Specification.
		*
		* In addition to the fields in the Credential subtree, this will also maintain necessary
		* information for the private key and certificates associated with this credential.
		*
		* Currently we only support the nodes that are used by Hotspot 2.0 Release 1.
		*
		* @hide
		*/
		public final class Credential implements Parcelable {
		/**
		* The realm associated with this credential. It will be used to determine
		* if this credential can be used to authenticate with a given hotspot by
		* comparing the realm specified in that hotspot's ANQP element.
		*/
		public String realm = null;

		/**
		* Username-password based credential.
		* Contains the fields under PerProviderSubscription/Credential/UsernamePassword subtree.
		*/
		public static final class UserCredential implements Parcelable {
		/**
		* Username of the credential.
		*/
		public String username = null;

		/**
		* Base64-encoded password.
		*/
		public String password = null;

		/**
		* EAP (Extensible Authentication Protocol) method type.
		* Refer to http://www.iana.org/assignments/eap-numbers/eap-numbers.xml#eap-numbers-4
		* for valid values.
		* Using Integer.MIN_VALUE to indicate unset value.
		*/
		public int eapType = Integer.MIN_VALUE;

		/**
		* Non-EAP inner authentication method.
		*/
		public String nonEapInnerMethod = null;

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeString(username);
		dest.writeString(password);
		dest.writeInt(eapType);
		dest.writeString(nonEapInnerMethod);
		}

		@Override
		public boolean equals(Object thatObject) {
		if (this == thatObject) {
		return true;
		}
		if (!(thatObject instanceof UserCredential)) {
		return false;
		}

		UserCredential that = (UserCredential) thatObject;
		return TextUtils.equals(username, that.username) &&
		TextUtils.equals(password, that.password) &&
		eapType == that.eapType &&
		TextUtils.equals(nonEapInnerMethod, that.nonEapInnerMethod);
		}

		public static final Creator<UserCredential> CREATOR =
		new Creator<UserCredential>() {
		@Override
		public UserCredential createFromParcel(Parcel in) {
		UserCredential userCredential = new UserCredential();
		userCredential.username = in.readString();
		userCredential.password = in.readString();
		userCredential.eapType = in.readInt();
		userCredential.nonEapInnerMethod = in.readString();
		return userCredential;
		}

		@Override
		public UserCredential[] newArray(int size) {
		return new UserCredential[size];
		}
		};
		}
		public UserCredential userCredential = null;

		/**
		* Certificate based credential.
		* Contains fields under PerProviderSubscription/Credential/DigitalCertificate subtree.
		*/
		public static final class CertificateCredential implements Parcelable {
		/**
		* Certificate type. Valid values are "802.1ar" and "x509v3".
		*/
		public String certType = null;

		/**
		* The SHA-256 fingerprint of the certificate.
		*/
		public byte[] certSha256FingerPrint = null;

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeString(certType);
		dest.writeByteArray(certSha256FingerPrint);
		}

		@Override
		public boolean equals(Object thatObject) {
		if (this == thatObject) {
		return true;
		}
		if (!(thatObject instanceof CertificateCredential)) {
		return false;
		}

		CertificateCredential that = (CertificateCredential) thatObject;
		return TextUtils.equals(certType, that.certType) &&
		Arrays.equals(certSha256FingerPrint, that.certSha256FingerPrint);
		}

		public static final Creator<CertificateCredential> CREATOR =
		new Creator<CertificateCredential>() {
		@Override
		public CertificateCredential createFromParcel(Parcel in) {
		CertificateCredential certCredential = new CertificateCredential();
		certCredential.certType = in.readString();
		certCredential.certSha256FingerPrint = in.createByteArray();
		return certCredential;
		}

		@Override
		public CertificateCredential[] newArray(int size) {
		return new CertificateCredential[size];
		}
		};
		}
		public CertificateCredential certCredential = null;

		/**
		* SIM (Subscriber Identify Module) based credential.
		* Contains fields under PerProviderSubscription/Credential/SIM subtree.
		*/
		public static final class SimCredential implements Parcelable {
		/**
		* International Mobile device Subscriber Identity.
		*/
		public String imsi = null;

		/**
		* EAP (Extensible Authentication Protocol) method type for using SIM credential.
		* Refer to http://www.iana.org/assignments/eap-numbers/eap-numbers.xml#eap-numbers-4
		* for valid values.
		* Using Integer.MIN_VALUE to indicate unset value.
		*/
		public int eapType = Integer.MIN_VALUE;

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public boolean equals(Object thatObject) {
		if (this == thatObject) {
		return true;
		}
		if (!(thatObject instanceof SimCredential)) {
		return false;
		}

		SimCredential that = (SimCredential) thatObject;
		return TextUtils.equals(imsi, that.imsi) &&
		eapType == that.eapType;
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeString(imsi);
		dest.writeInt(eapType);
		}

		public static final Creator<SimCredential> CREATOR =
		new Creator<SimCredential>() {
		@Override
		public SimCredential createFromParcel(Parcel in) {
		SimCredential simCredential = new SimCredential();
		simCredential.imsi = in.readString();
		simCredential.eapType = in.readInt();
		return simCredential;
		}

		@Override
		public SimCredential[] newArray(int size) {
		return new SimCredential[size];
		}
		};
		}
		public SimCredential simCredential = null;

		/**
		* CA (Certificate Authority) X509 certificate.
		*/
		public X509Certificate caCertificate = null;

		/**
		* Client side X509 certificate chain.
		*/
		public X509Certificate[] clientCertificateChain = null;

		/**
		* Client side private key.
		*/
		public PrivateKey clientPrivateKey = null;

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeString(realm);
		dest.writeParcelable(userCredential, flags);
		dest.writeParcelable(certCredential, flags);
		dest.writeParcelable(simCredential, flags);
		ParcelUtil.writeCertificate(dest, caCertificate);
		ParcelUtil.writeCertificates(dest, clientCertificateChain);
		ParcelUtil.writePrivateKey(dest, clientPrivateKey);
		}

		@Override
		public boolean equals(Object thatObject) {
		if (this == thatObject) {
		return true;
		}
		if (!(thatObject instanceof Credential)) {
		return false;
		}

		Credential that = (Credential) thatObject;
		return TextUtils.equals(realm, that.realm) &&
		(userCredential == null ? that.userCredential == null :
		userCredential.equals(that.userCredential)) &&
		(certCredential == null ? that.certCredential == null :
		certCredential.equals(that.certCredential)) &&
		(simCredential == null ? that.simCredential == null :
		simCredential.equals(that.simCredential)) &&
		isX509CertificateEquals(caCertificate, that.caCertificate) &&
		isX509CertificatesEquals(clientCertificateChain, that.clientCertificateChain) &&
		isPrivateKeyEquals(clientPrivateKey, that.clientPrivateKey);
		}

		public static final Creator<Credential> CREATOR =
		new Creator<Credential>() {
		@Override
		public Credential createFromParcel(Parcel in) {
		Credential credential = new Credential();
		credential.realm = in.readString();
		credential.userCredential = in.readParcelable(null);
		credential.certCredential = in.readParcelable(null);
		credential.simCredential = in.readParcelable(null);
		credential.caCertificate = ParcelUtil.readCertificate(in);
		credential.clientCertificateChain = ParcelUtil.readCertificates(in);
		credential.clientPrivateKey = ParcelUtil.readPrivateKey(in);
		return credential;
		}

		@Override
		public Credential[] newArray(int size) {
		return new Credential[size];
		}
		};

		private static boolean isPrivateKeyEquals(PrivateKey key1, PrivateKey key2) {
		if (key1 == null && key2 == null) {
		return true;
		}

		/* Return false if only one of them is null */
		if (key1 == null \|\| key2 == null) {
		return false;
		}

		return TextUtils.equals(key1.getAlgorithm(), key2.getAlgorithm()) &&
		Arrays.equals(key1.getEncoded(), key2.getEncoded());
		}

		private static boolean isX509CertificateEquals(X509Certificate cert1, X509Certificate cert2) {
		if (cert1 == null && cert2 == null) {
		return true;
		}

		/* Return false if only one of them is null */
		if (cert1 == null \|\| cert2 == null) {
		return false;
		}

		boolean result = false;
		try {
		result = Arrays.equals(cert1.getEncoded(), cert2.getEncoded());
		} catch (CertificateEncodingException e) {
		/* empty, return false. */
		}
		return result;
		}

		private static boolean isX509CertificatesEquals(X509Certificate[] certs1,
		X509Certificate[] certs2) {
		if (certs1 == null && certs2 == null) {
		return true;
		}

		/* Return false if only one of them is null */
		if (certs1 == null \|\| certs2 == null) {
		return false;
		}

		if (certs1.length != certs2.length) {
		return false;
		}

		for (int i = 0; i < certs1.length; i++) {
		if (!isX509CertificateEquals(certs1[i], certs2[i])) {
		return false;
		}
		}

		return true;
		}
		}

wifi/java/android/net/wifi/hotspot2/pps/HomeSP.aidl

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2016, 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.net.wifi.hotspot2.pps;

		parcelable HomeSP;