Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update frameworks to use unbundled version of BouncyCastle."

Browse Source
This commit is contained in:
Treehugger Robot
2021-02-02 14:37:05 +00:00
committed by Gerrit Code Review
parent 4a76351c9b 59444d5be7
commit 19547685bb
7 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -574,6 +574,7 @@ java_library {
], ],
sdk_version: "core_platform", sdk_version: "core_platform",
static_libs: [ static_libs: [
"bouncycastle-repackaged-unbundled",
"framework-internal-utils", "framework-internal-utils",
// If MimeMap ever becomes its own APEX, then this dependency would need to be removed // If MimeMap ever becomes its own APEX, then this dependency would need to be removed
// in favor of an API stubs dependency in java_library "framework" below. // in favor of an API stubs dependency in java_library "framework" below.

2
core/java/android/net/http/SslCertificate.java
View File

@@ -26,7 +26,7 @@ import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import com.android.internal.util.HexDump; import com.android.internal.util.HexDump;
import com.android.org.bouncycastle.asn1.x509.X509Name; import com.android.internal.org.bouncycastle.asn1.x509.X509Name;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.math.BigInteger; import java.math.BigInteger;

6
keystore/java/android/security/Credentials.java
View File

@@ -19,9 +19,9 @@ package android.security;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.os.Build; import android.os.Build;
import com.android.org.bouncycastle.util.io.pem.PemObject; import com.android.internal.org.bouncycastle.util.io.pem.PemObject;
import com.android.org.bouncycastle.util.io.pem.PemReader; import com.android.internal.org.bouncycastle.util.io.pem.PemReader;
import com.android.org.bouncycastle.util.io.pem.PemWriter; import com.android.internal.org.bouncycastle.util.io.pem.PemWriter;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;

4
keystore/java/android/security/KeyStore.java
View File

@@ -45,8 +45,8 @@ import android.security.keystore.KeystoreResponse;
import android.security.keystore.UserNotAuthenticatedException; import android.security.keystore.UserNotAuthenticatedException;
import android.util.Log; import android.util.Log;
import com.android.org.bouncycastle.asn1.ASN1InputStream; import com.android.internal.org.bouncycastle.asn1.ASN1InputStream;
import com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo; import com.android.internal.org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;

36
keystore/java/android/security/keystore/AndroidKeyStoreKeyPairGeneratorSpi.java
View File

@@ -26,24 +26,24 @@ import android.security.keymaster.KeymasterArguments;
import android.security.keymaster.KeymasterCertificateChain; import android.security.keymaster.KeymasterCertificateChain;
import android.security.keymaster.KeymasterDefs; import android.security.keymaster.KeymasterDefs;
import com.android.org.bouncycastle.asn1.ASN1EncodableVector; import com.android.internal.org.bouncycastle.asn1.ASN1EncodableVector;
import com.android.org.bouncycastle.asn1.ASN1InputStream; import com.android.internal.org.bouncycastle.asn1.ASN1InputStream;
import com.android.org.bouncycastle.asn1.ASN1Integer; import com.android.internal.org.bouncycastle.asn1.ASN1Integer;
import com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier; import com.android.internal.org.bouncycastle.asn1.ASN1ObjectIdentifier;
import com.android.org.bouncycastle.asn1.DERBitString; import com.android.internal.org.bouncycastle.asn1.DERBitString;
import com.android.org.bouncycastle.asn1.DERNull; import com.android.internal.org.bouncycastle.asn1.DERNull;
import com.android.org.bouncycastle.asn1.DERSequence; import com.android.internal.org.bouncycastle.asn1.DERSequence;
import com.android.org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; import com.android.internal.org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
import com.android.org.bouncycastle.asn1.x509.AlgorithmIdentifier; import com.android.internal.org.bouncycastle.asn1.x509.AlgorithmIdentifier;
import com.android.org.bouncycastle.asn1.x509.Certificate; import com.android.internal.org.bouncycastle.asn1.x509.Certificate;
import com.android.org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; import com.android.internal.org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
import com.android.org.bouncycastle.asn1.x509.TBSCertificate; import com.android.internal.org.bouncycastle.asn1.x509.TBSCertificate;
import com.android.org.bouncycastle.asn1.x509.Time; import com.android.internal.org.bouncycastle.asn1.x509.Time;
import com.android.org.bouncycastle.asn1.x509.V3TBSCertificateGenerator; import com.android.internal.org.bouncycastle.asn1.x509.V3TBSCertificateGenerator;
import com.android.org.bouncycastle.asn1.x9.X9ObjectIdentifiers; import com.android.internal.org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
import com.android.org.bouncycastle.jce.X509Principal; import com.android.internal.org.bouncycastle.jce.X509Principal;
import com.android.org.bouncycastle.jce.provider.X509CertificateObject; import com.android.internal.org.bouncycastle.jce.provider.X509CertificateObject;
import com.android.org.bouncycastle.x509.X509V3CertificateGenerator; import com.android.internal.org.bouncycastle.x509.X509V3CertificateGenerator;
import libcore.util.EmptyArray; import libcore.util.EmptyArray;

1
tests/net/Android.bp
View File

@@ -53,6 +53,7 @@ android_test {
jarjar_rules: "jarjar-rules.txt", jarjar_rules: "jarjar-rules.txt",
static_libs: [ static_libs: [
"androidx.test.rules", "androidx.test.rules",
"bouncycastle-repackaged-unbundled",
"FrameworksNetCommonTests", "FrameworksNetCommonTests",
"frameworks-base-testutils", "frameworks-base-testutils",
"frameworks-net-integration-testutils", "frameworks-net-integration-testutils",

2
tests/net/java/android/net/Ikev2VpnProfileTest.java
View File

@@ -30,7 +30,7 @@ import androidx.test.runner.AndroidJUnit4;
import com.android.internal.net.VpnProfile; import com.android.internal.net.VpnProfile;
import com.android.net.module.util.ProxyUtils; import com.android.net.module.util.ProxyUtils;
import com.android.org.bouncycastle.x509.X509V1CertificateGenerator; import com.android.internal.org.bouncycastle.x509.X509V1CertificateGenerator;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;