|
 |
20e580 |
From eb9e9114295999eb490f81f232332b32aa0d76da Mon Sep 17 00:00:00 2001
|
|
|
20e580 |
From: Jack Magne <jmagne@test.host.com>
|
|
|
20e580 |
Date: Wed, 6 May 2020 21:31:28 -0400
|
|
|
20e580 |
Subject: [PATCH 4/4] More SHA256withRSA/PSS algorithm fixes. Various typos
|
|
|
20e580 |
resolved to result in this algorithm being able to function correctly.
|
|
|
20e580 |
|
|
|
20e580 |
---
|
|
|
20e580 |
org/mozilla/jss/crypto/SignatureAlgorithm.java | 2 +-
|
|
|
20e580 |
org/mozilla/jss/netscape/security/x509/AlgorithmId.java | 2 +-
|
|
|
20e580 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
20e580 |
|
|
|
20e580 |
diff --git a/org/mozilla/jss/crypto/SignatureAlgorithm.java b/org/mozilla/jss/crypto/SignatureAlgorithm.java
|
|
|
20e580 |
index c41b5401..a46c2b92 100644
|
|
|
20e580 |
--- a/org/mozilla/jss/crypto/SignatureAlgorithm.java
|
|
|
20e580 |
+++ b/org/mozilla/jss/crypto/SignatureAlgorithm.java
|
|
|
20e580 |
@@ -102,7 +102,7 @@ public class SignatureAlgorithm extends Algorithm {
|
|
|
20e580 |
|
|
|
20e580 |
public static final SignatureAlgorithm
|
|
|
20e580 |
RSAPSSSignatureWithSHA512Digest = new SignatureAlgorithm(SEC_OID_PKCS1_RSA_PSS_SIGNATURE, "RSAPSSSignatureWithSHA512Digest",
|
|
|
20e580 |
- null, DigestAlgorithm.SHA384, OBJECT_IDENTIFIER.PKCS1.subBranch(10) );
|
|
|
20e580 |
+ null, DigestAlgorithm.SHA512, OBJECT_IDENTIFIER.PKCS1.subBranch(10) );
|
|
|
20e580 |
|
|
|
20e580 |
/**********************************************************************
|
|
|
20e580 |
* Raw RSA signing. This algorithm does not do any hashing, it merely
|
|
|
20e580 |
diff --git a/org/mozilla/jss/netscape/security/x509/AlgorithmId.java b/org/mozilla/jss/netscape/security/x509/AlgorithmId.java
|
|
|
20e580 |
index 4440fd4d..0a332f23 100644
|
|
|
20e580 |
--- a/org/mozilla/jss/netscape/security/x509/AlgorithmId.java
|
|
|
20e580 |
+++ b/org/mozilla/jss/netscape/security/x509/AlgorithmId.java
|
|
|
20e580 |
@@ -763,7 +763,7 @@ public class AlgorithmId implements Serializable, DerEncoder {
|
|
|
20e580 |
} else if ("SHA384withRSA/PSS".equals(algName)) {
|
|
|
20e580 |
pssSpec = new PSSParameterSpec("SHA-384", "MGF1", MGF1ParameterSpec.SHA384, 48, 1);
|
|
|
20e580 |
|
|
|
20e580 |
- } else if ("SHA384withRSA/PSS".equals(algName)) {
|
|
|
20e580 |
+ } else if ("SHA512withRSA/PSS".equals(algName)) {
|
|
|
20e580 |
pssSpec = new PSSParameterSpec("SHA-512", "MGF1", MGF1ParameterSpec.SHA512, 64, 1);
|
|
|
20e580 |
}
|
|
|
20e580 |
try {
|
|
|
20e580 |
--
|
|
|
20e580 |
2.26.2
|
|
|
20e580 |
|