49 lines
2.1 KiB
Diff
49 lines
2.1 KiB
Diff
From 8df7456ada0da95cfbaef4b4b8ecf4487f586c1b Mon Sep 17 00:00:00 2001
|
|
From: Marco Fargetta <fmarco76@users.noreply.github.com>
|
|
Date: Fri, 11 Nov 2022 10:15:32 +0100
|
|
Subject: [PATCH] Fix certificate signature algorithm not valid (#904)
|
|
|
|
---
|
|
.../java/org/mozilla/jss/tests/GenerateTestCert.java | 9 +++++++--
|
|
src/test/java/org/mozilla/jss/tests/SSLClientAuth.java | 4 ++--
|
|
2 files changed, 9 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/test/java/org/mozilla/jss/tests/GenerateTestCert.java b/src/test/java/org/mozilla/jss/tests/GenerateTestCert.java
|
|
index 7af6125a2..623fe8385 100755
|
|
--- a/src/test/java/org/mozilla/jss/tests/GenerateTestCert.java
|
|
+++ b/src/test/java/org/mozilla/jss/tests/GenerateTestCert.java
|
|
@@ -302,8 +302,13 @@ public class GenerateTestCert {
|
|
int rand,
|
|
SEQUENCE extensions) throws Exception {
|
|
|
|
- AlgorithmIdentifier sigAlgID = new AlgorithmIdentifier(sigAlg.toOID());
|
|
-
|
|
+ AlgorithmIdentifier sigAlgID = null;
|
|
+ if(keyType.equals("RSA")) {
|
|
+ sigAlgID = new AlgorithmIdentifier(sigAlg.toOID(), null);
|
|
+ }
|
|
+ else {
|
|
+ sigAlgID = new AlgorithmIdentifier(sigAlg.toOID());
|
|
+ }
|
|
Name issuer = new Name();
|
|
issuer.addCountryName("US");
|
|
issuer.addOrganizationName("Mozilla");
|
|
diff --git a/src/test/java/org/mozilla/jss/tests/SSLClientAuth.java b/src/test/java/org/mozilla/jss/tests/SSLClientAuth.java
|
|
index 53fc218d3..80fbe6b05 100644
|
|
--- a/src/test/java/org/mozilla/jss/tests/SSLClientAuth.java
|
|
+++ b/src/test/java/org/mozilla/jss/tests/SSLClientAuth.java
|
|
@@ -46,8 +46,8 @@ public class SSLClientAuth implements Runnable {
|
|
public static Certificate makeCert(String issuerName, String subjectName,
|
|
int serialNumber, PrivateKey privKey, PublicKey pubKey, int rand,
|
|
SEQUENCE extensions) throws Exception {
|
|
- AlgorithmIdentifier sigAlgID = new AlgorithmIdentifier( sigAlg.toOID());
|
|
-
|
|
+ AlgorithmIdentifier sigAlgID = new AlgorithmIdentifier( sigAlg.toOID(), null);
|
|
+
|
|
Name issuer = new Name();
|
|
issuer.addCountryName("US");
|
|
issuer.addOrganizationName("Mozilla");
|
|
--
|
|
2.42.0
|
|
|