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

Commit ebe68ec2 authored by Alex Klyubin's avatar Alex Klyubin Committed by Gerrit Code Review
Browse files

Merge "Fix DSA APK signatures for API Level 8 and lower."

parents e72fc639 819b5354

tools/apksigner/core/src/com/android/apksigner/core/internal/apk/v1/V1SchemeSigner.java

+44 −5
Original line number Original line Diff line number Diff line
@@ -41,13 +41,20 @@ import java.util.jar.Attributes; 
import java.util.jar.Manifest;

import java.util.jar.Manifest;





import org.bouncycastle.asn1.ASN1InputStream;

import org.bouncycastle.asn1.ASN1InputStream;

import org.bouncycastle.asn1.ASN1ObjectIdentifier;

import org.bouncycastle.asn1.DERNull;

import org.bouncycastle.asn1.DEROutputStream;

import org.bouncycastle.asn1.DEROutputStream;

import org.bouncycastle.asn1.x509.AlgorithmIdentifier;

import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;

import org.bouncycastle.cert.jcajce.JcaCertStore;

import org.bouncycastle.cert.jcajce.JcaCertStore;

import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;

import org.bouncycastle.cms.CMSException;

import org.bouncycastle.cms.CMSException;

import org.bouncycastle.cms.CMSProcessableByteArray;

import org.bouncycastle.cms.CMSProcessableByteArray;

import org.bouncycastle.cms.CMSSignatureEncryptionAlgorithmFinder;

import org.bouncycastle.cms.CMSSignedData;

import org.bouncycastle.cms.CMSSignedData;

import org.bouncycastle.cms.CMSSignedDataGenerator;

import org.bouncycastle.cms.CMSSignedDataGenerator;

import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;

import org.bouncycastle.cms.DefaultCMSSignatureEncryptionAlgorithmFinder;

import org.bouncycastle.cms.SignerInfoGeneratorBuilder;

import org.bouncycastle.operator.ContentSigner;

import org.bouncycastle.operator.ContentSigner;

import org.bouncycastle.operator.OperatorCreationException;

import org.bouncycastle.operator.OperatorCreationException;

import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;

import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
@@ -462,10 +469,11 @@ public abstract class V1SchemeSigner { 
                    .build(signerConfig.privateKey);

                    .build(signerConfig.privateKey);

            CMSSignedDataGenerator gen = new CMSSignedDataGenerator();

            CMSSignedDataGenerator gen = new CMSSignedDataGenerator();

            gen.addSignerInfoGenerator(

            gen.addSignerInfoGenerator(

                    new JcaSignerInfoGeneratorBuilder(

                    new SignerInfoGeneratorBuilder(

                            new JcaDigestCalculatorProviderBuilder().build())

                            new JcaDigestCalculatorProviderBuilder().build(),

                            SignerInfoSignatureAlgorithmFinder.INSTANCE)

                            .setDirectSignature(true)

                            .setDirectSignature(true)

                    .build(signer, signerCert));

                            .build(signer, new JcaX509CertificateHolder(signerCert)));

            gen.addCertificates(certs);

            gen.addCertificates(certs);





            CMSSignedData sigData =

            CMSSignedData sigData =
@@ -482,6 +490,37 @@ public abstract class V1SchemeSigner { 
        }

        }

    }

    }





    /**

     * Chooser of SignatureAlgorithm for PKCS #7 CMS SignerInfo.

     */

    private static class SignerInfoSignatureAlgorithmFinder

            implements CMSSignatureEncryptionAlgorithmFinder {

        private static final SignerInfoSignatureAlgorithmFinder INSTANCE =

                new SignerInfoSignatureAlgorithmFinder();



        private static final AlgorithmIdentifier DSA =

                new AlgorithmIdentifier(X9ObjectIdentifiers.id_dsa, DERNull.INSTANCE);



        private final CMSSignatureEncryptionAlgorithmFinder mDefault =

                new DefaultCMSSignatureEncryptionAlgorithmFinder();



        @Override

        public AlgorithmIdentifier findEncryptionAlgorithm(AlgorithmIdentifier id) {

            // Use the default chooser, but replace dsaWithSha1 with dsa. This is because "dsa" is

            // accepted by any Android platform whereas "dsaWithSha1" is accepted only since

            // API Level 9.

            id = mDefault.findEncryptionAlgorithm(id);

            if (id != null) {

                ASN1ObjectIdentifier oid = id.getAlgorithm();

                if (X9ObjectIdentifiers.id_dsa_with_sha1.equals(oid)) {

                    return DSA;

                }

            }



            return id;

        }

    }



    private static String getEntryDigestAttributeName(DigestAlgorithm digestAlgorithm) {

    private static String getEntryDigestAttributeName(DigestAlgorithm digestAlgorithm) {

        switch (digestAlgorithm) {

        switch (digestAlgorithm) {

            case SHA1:

            case SHA1: