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

Commit 96bdc2d7 authored by Daulet Zhanguzin's avatar Daulet Zhanguzin Committed by Automerger Merge Worker
Browse files

Merge "Remove DERInteger usages" am: 1835a248 am: 07e62d76 

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

Change-Id: I7ec9709e9f152fac13b3f56dc1f9238869502c39
parents 6852f5bd 07e62d76

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

+2 −3
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 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.DERInteger;

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

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

import com.android.org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
@@ -702,8 +701,8 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato 
                sigAlgOid = X9ObjectIdentifiers.ecdsa_with_SHA256;

                sigAlgId = new AlgorithmIdentifier(sigAlgOid);

                ASN1EncodableVector v = new ASN1EncodableVector();

                v.add(new DERInteger(0));

                v.add(new DERInteger(0));

                v.add(new ASN1Integer(BigInteger.valueOf(0)));

                v.add(new ASN1Integer(BigInteger.valueOf(0)));

                signature = new DERSequence().getEncoded();

                break;

            case KeymasterDefs.KM_ALGORITHM_RSA: