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

Commit ef15221e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Update frameworks to use unbundled version of BouncyCastle." am: 19547685 am: 36adf13e am: c3c1cd54 am: 34becf17

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559779

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e9c05321f75379e795b81045279f0fd59a91553
parents 017c25bf 34becf17

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -632,6 +632,7 @@ java_defaults { 
    ],

    sdk_version: "core_platform",

    static_libs: [

        "bouncycastle-repackaged-unbundled",

        "framework-internal-utils",

        // 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.

core/java/android/net/http/SslCertificate.java

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import android.view.View; 
import android.widget.TextView;



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.math.BigInteger;

keystore/java/android/security/Credentials.java

+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ package android.security; 
import android.compat.annotation.UnsupportedAppUsage;

import android.os.Build;



import com.android.org.bouncycastle.util.io.pem.PemObject;

import com.android.org.bouncycastle.util.io.pem.PemReader;

import com.android.org.bouncycastle.util.io.pem.PemWriter;

import com.android.internal.org.bouncycastle.util.io.pem.PemObject;

import com.android.internal.org.bouncycastle.util.io.pem.PemReader;

import com.android.internal.org.bouncycastle.util.io.pem.PemWriter;



import java.io.ByteArrayInputStream;

import java.io.ByteArrayOutputStream;

keystore/java/android/security/KeyStore.java

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ import android.security.keystore.KeystoreResponse; 
import android.security.keystore.UserNotAuthenticatedException;

import android.util.Log;



import com.android.org.bouncycastle.asn1.ASN1InputStream;

import com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo;

import com.android.internal.org.bouncycastle.asn1.ASN1InputStream;

import com.android.internal.org.bouncycastle.asn1.pkcs.PrivateKeyInfo;



import java.io.ByteArrayInputStream;

import java.io.IOException;

keystore/java/android/security/keystore/AndroidKeyStoreKeyPairGeneratorSpi.java

+18 −18
Original line number Diff line number Diff line
@@ -26,24 +26,24 @@ import android.security.keymaster.KeymasterArguments; 
import android.security.keymaster.KeymasterCertificateChain;

import android.security.keymaster.KeymasterDefs;



import com.android.org.bouncycastle.asn1.ASN1EncodableVector;

import com.android.org.bouncycastle.asn1.ASN1InputStream;

import com.android.org.bouncycastle.asn1.ASN1Integer;

import com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier;

import com.android.org.bouncycastle.asn1.DERBitString;

import com.android.org.bouncycastle.asn1.DERNull;

import com.android.org.bouncycastle.asn1.DERSequence;

import com.android.org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;

import com.android.org.bouncycastle.asn1.x509.AlgorithmIdentifier;

import com.android.org.bouncycastle.asn1.x509.Certificate;

import com.android.org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;

import com.android.org.bouncycastle.asn1.x509.TBSCertificate;

import com.android.org.bouncycastle.asn1.x509.Time;

import com.android.org.bouncycastle.asn1.x509.V3TBSCertificateGenerator;

import com.android.org.bouncycastle.asn1.x9.X9ObjectIdentifiers;

import com.android.org.bouncycastle.jce.X509Principal;

import com.android.org.bouncycastle.jce.provider.X509CertificateObject;

import com.android.org.bouncycastle.x509.X509V3CertificateGenerator;

import com.android.internal.org.bouncycastle.asn1.ASN1EncodableVector;

import com.android.internal.org.bouncycastle.asn1.ASN1InputStream;

import com.android.internal.org.bouncycastle.asn1.ASN1Integer;

import com.android.internal.org.bouncycastle.asn1.ASN1ObjectIdentifier;

import com.android.internal.org.bouncycastle.asn1.DERBitString;

import com.android.internal.org.bouncycastle.asn1.DERNull;

import com.android.internal.org.bouncycastle.asn1.DERSequence;

import com.android.internal.org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;

import com.android.internal.org.bouncycastle.asn1.x509.AlgorithmIdentifier;

import com.android.internal.org.bouncycastle.asn1.x509.Certificate;

import com.android.internal.org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;

import com.android.internal.org.bouncycastle.asn1.x509.TBSCertificate;

import com.android.internal.org.bouncycastle.asn1.x509.Time;

import com.android.internal.org.bouncycastle.asn1.x509.V3TBSCertificateGenerator;

import com.android.internal.org.bouncycastle.asn1.x9.X9ObjectIdentifiers;

import com.android.internal.org.bouncycastle.jce.X509Principal;

import com.android.internal.org.bouncycastle.jce.provider.X509CertificateObject;

import com.android.internal.org.bouncycastle.x509.X509V3CertificateGenerator;



import libcore.util.EmptyArray;