diff options
| author | Sergio Giro <sgiro@google.com> | 2017-01-19 21:40:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-19 21:40:17 +0000 |
| commit | fbf7512c8942075f80cba53e708c13682f04ea29 (patch) | |
| tree | 8ebc72ead6f9a80938fdba92e217da96ee451037 /bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/DigestSignatureSpi.java | |
| parent | e54ca62fe13a7f6a52a89e409edcf4b6547072be (diff) | |
| parent | 07a37e800ceaa1470036078af8d69981604e0945 (diff) | |
| download | bouncycastle-fbf7512c8942075f80cba53e708c13682f04ea29.tar.gz | |
Merge "bouncycastle: upgrade to version 1.56" am: ae9dc88d85 am: ed012da722
am: 07a37e800c
Change-Id: Ie6a51b57d83037f0f7f1acecedc16da1c1bd6820
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/DigestSignatureSpi.java')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/DigestSignatureSpi.java | 52 |
1 files changed, 42 insertions, 10 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/DigestSignatureSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/DigestSignatureSpi.java index 9616a99b..1e4d854b 100644 --- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/DigestSignatureSpi.java +++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/DigestSignatureSpi.java @@ -31,20 +31,16 @@ import org.bouncycastle.crypto.digests.AndroidDigestFactory; // BEGIN android-removed // import org.bouncycastle.crypto.digests.MD2Digest; // import org.bouncycastle.crypto.digests.MD4Digest; -// import org.bouncycastle.crypto.digests.MD5Digest; // import org.bouncycastle.crypto.digests.NullDigest; // import org.bouncycastle.crypto.digests.RIPEMD128Digest; // import org.bouncycastle.crypto.digests.RIPEMD160Digest; // import org.bouncycastle.crypto.digests.RIPEMD256Digest; -// import org.bouncycastle.crypto.digests.SHA1Digest; -// import org.bouncycastle.crypto.digests.SHA224Digest; -// import org.bouncycastle.crypto.digests.SHA256Digest; -// import org.bouncycastle.crypto.digests.SHA384Digest; -// import org.bouncycastle.crypto.digests.SHA512Digest; -// import org.bouncycastle.crypto.digests.SHA512tDigest; // END android-removed import org.bouncycastle.crypto.encodings.PKCS1Encoding; import org.bouncycastle.crypto.engines.RSABlindedEngine; +// BEGIN android-removed +// import org.bouncycastle.crypto.util.DigestFactory; +// END android-removed import org.bouncycastle.util.Arrays; public class DigestSignatureSpi @@ -318,7 +314,7 @@ public class DigestSignatureSpi // { // public SHA512_224() // { - // super(NISTObjectIdentifiers.id_sha512_224, new SHA512tDigest(224), new PKCS1Encoding(new RSABlindedEngine())); + // super(NISTObjectIdentifiers.id_sha512_224, DigestFactory.createSHA512_224(), new PKCS1Encoding(new RSABlindedEngine())); // } // } @@ -327,7 +323,43 @@ public class DigestSignatureSpi // { // public SHA512_256() // { - // super(NISTObjectIdentifiers.id_sha512_256, new SHA512tDigest(256), new PKCS1Encoding(new RSABlindedEngine())); + // super(NISTObjectIdentifiers.id_sha512_256, DigestFactory.createSHA512_256(), new PKCS1Encoding(new RSABlindedEngine())); + // } + // } + + // static public class SHA3_224 + // extends DigestSignatureSpi + // { + // public SHA3_224() + // { + // super(NISTObjectIdentifiers.id_sha3_224, DigestFactory.createSHA3_224(), new PKCS1Encoding(new RSABlindedEngine())); + // } + // } + + // static public class SHA3_256 + // extends DigestSignatureSpi + // { + // public SHA3_256() + // { + // super(NISTObjectIdentifiers.id_sha3_256, DigestFactory.createSHA3_256(), new PKCS1Encoding(new RSABlindedEngine())); + // } + // } + + // static public class SHA3_384 + // extends DigestSignatureSpi + // { + // public SHA3_384() + // { + // super(NISTObjectIdentifiers.id_sha3_384, DigestFactory.createSHA3_384(), new PKCS1Encoding(new RSABlindedEngine())); + // } + // } + + // static public class SHA3_512 + // extends DigestSignatureSpi + // { + // public SHA3_512() + // { + // super(NISTObjectIdentifiers.id_sha3_512, DigestFactory.createSHA3_512(), new PKCS1Encoding(new RSABlindedEngine())); // } // } @@ -339,7 +371,7 @@ public class DigestSignatureSpi // super(PKCSObjectIdentifiers.md2, new MD2Digest(), new PKCS1Encoding(new RSABlindedEngine())); // } // } - // + // static public class MD4 // extends DigestSignatureSpi // { |