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 /bcpkix/src/main/java/org/bouncycastle/operator/jcajce/OperatorHelper.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 'bcpkix/src/main/java/org/bouncycastle/operator/jcajce/OperatorHelper.java')
| -rw-r--r-- | bcpkix/src/main/java/org/bouncycastle/operator/jcajce/OperatorHelper.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/OperatorHelper.java b/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/OperatorHelper.java index 19d46ec9..532d3b51 100644 --- a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/OperatorHelper.java +++ b/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/OperatorHelper.java @@ -383,7 +383,7 @@ class OperatorHelper String name = MessageDigestUtils.getDigestName(oid); int dIndex = name.indexOf('-'); - if (dIndex > 0) + if (dIndex > 0 && !name.startsWith("SHA3")) { return name.substring(0, dIndex) + name.substring(dIndex + 1); } @@ -394,7 +394,6 @@ class OperatorHelper public X509Certificate convertCertificate(X509CertificateHolder certHolder) throws CertificateException { - try { CertificateFactory certFact = helper.createCertificateFactory("X.509"); |