diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-10-24 04:17:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-10-24 04:17:59 +0000 |
| commit | dce2c33e0eef9dc258ac3ed6484a0a65be78b203 (patch) | |
| tree | c0998aa81429237b06cd7d109dcba8333854d1ae /service | |
| parent | 3a2d7863846b45eab8be7c4c16a3a9da9b8f9d48 (diff) | |
| parent | 7c970f40f0f587742d7e66fcd554f753beaefea4 (diff) | |
Merge "WifiStack: Change bouncy castle package"
Diffstat (limited to 'service')
| -rw-r--r-- | service/Android.bp | 2 | ||||
| -rw-r--r-- | service/jarjar-rules-shared.txt | 2 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/hotspot2/ServiceProviderVerifier.java | 13 |
3 files changed, 9 insertions, 8 deletions
diff --git a/service/Android.bp b/service/Android.bp index 526e66782..15e0dcd17 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -104,7 +104,7 @@ java_library { "android.hardware.wifi.supplicant-V1.3-java", "android.hidl.manager-V1.2-java", "androidx.annotation_annotation", - "bouncycastle-unbundled", + "bouncycastle-unbundled", "wifi_service_proto", "ksoap2", "libnanohttpd", diff --git a/service/jarjar-rules-shared.txt b/service/jarjar-rules-shared.txt index bcb36a868..8a6435a1a 100644 --- a/service/jarjar-rules-shared.txt +++ b/service/jarjar-rules-shared.txt @@ -18,4 +18,4 @@ rule android.util.proto.ProtoStream* com.android.server.wifi.util.proto.ProtoStr rule android.util.proto.ProtoOutputStream* com.android.server.wifi.util.proto.ProtoOutputStream@1 # Use our statically linked bouncy castle version -rule com.android.org.bouncycastle.asn1** com.android.server.wifi.bouncycastle.asn1@1 +rule org.bouncycastle.** com.android.server.wifi.bouncycastle.@1 diff --git a/service/java/com/android/server/wifi/hotspot2/ServiceProviderVerifier.java b/service/java/com/android/server/wifi/hotspot2/ServiceProviderVerifier.java index d0f6dd541..bae7b7019 100644 --- a/service/java/com/android/server/wifi/hotspot2/ServiceProviderVerifier.java +++ b/service/java/com/android/server/wifi/hotspot2/ServiceProviderVerifier.java @@ -22,12 +22,13 @@ import android.util.Log; import android.util.Pair; import com.android.internal.annotations.VisibleForTesting; -import com.android.org.bouncycastle.asn1.ASN1Encodable; -import com.android.org.bouncycastle.asn1.ASN1InputStream; -import com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier; -import com.android.org.bouncycastle.asn1.ASN1Sequence; -import com.android.org.bouncycastle.asn1.DERTaggedObject; -import com.android.org.bouncycastle.asn1.DERUTF8String; + +import org.bouncycastle.asn1.ASN1Encodable; +import org.bouncycastle.asn1.ASN1InputStream; +import org.bouncycastle.asn1.ASN1ObjectIdentifier; +import org.bouncycastle.asn1.ASN1Sequence; +import org.bouncycastle.asn1.DERTaggedObject; +import org.bouncycastle.asn1.DERUTF8String; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; |