|
 |
b1e4e4 |
From 0d68b11baa49673a8f43cf1e4f325427ab2066da Mon Sep 17 00:00:00 2001
|
|
|
b1e4e4 |
From: jmagne <jmagne@redhat.com>
|
|
|
b1e4e4 |
Date: Mon, 30 Mar 2020 20:40:50 -0400
|
|
|
b1e4e4 |
Subject: [PATCH] Minor fix to appease ipa install. The code in question was
|
|
|
b1e4e4 |
getting (#364)
|
|
|
b1e4e4 |
|
|
|
b1e4e4 |
an algorithmId name with trailing whitespace, which was not recognized.
|
|
|
b1e4e4 |
|
|
|
b1e4e4 |
Co-authored-by: Jack Magne <jmagne@test.host.com>
|
|
|
b1e4e4 |
(cherry picked from commit 53de751485b04fe2a1555228342ed642c9a9e347)
|
|
|
b1e4e4 |
---
|
|
|
b1e4e4 |
.../cms/src/com/netscape/cms/profile/def/SigningAlgDefault.java | 7 ++++++-
|
|
|
b1e4e4 |
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
b1e4e4 |
|
|
|
b1e4e4 |
diff --git a/base/server/cms/src/com/netscape/cms/profile/def/SigningAlgDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/SigningAlgDefault.java
|
|
|
b1e4e4 |
index 97f221e..a0d0d33 100644
|
|
|
b1e4e4 |
--- a/base/server/cms/src/com/netscape/cms/profile/def/SigningAlgDefault.java
|
|
|
b1e4e4 |
+++ b/base/server/cms/src/com/netscape/cms/profile/def/SigningAlgDefault.java
|
|
|
b1e4e4 |
@@ -119,9 +119,14 @@ public class SigningAlgDefault extends EnrollDefault {
|
|
|
b1e4e4 |
}
|
|
|
b1e4e4 |
if (name.equals(VAL_ALGORITHM)) {
|
|
|
b1e4e4 |
try {
|
|
|
b1e4e4 |
+ String newValue = value;
|
|
|
b1e4e4 |
+ if(newValue != null) {
|
|
|
b1e4e4 |
+ newValue = newValue.trim();
|
|
|
b1e4e4 |
+ }
|
|
|
b1e4e4 |
+ CMS.debug("SigningAlgDefault: setValue value: " + newValue);
|
|
|
b1e4e4 |
info.set(X509CertInfo.ALGORITHM_ID,
|
|
|
b1e4e4 |
new CertificateAlgorithmId(
|
|
|
b1e4e4 |
- AlgorithmId.get(value)));
|
|
|
b1e4e4 |
+ AlgorithmId.get(newValue)));
|
|
|
b1e4e4 |
} catch (Exception e) {
|
|
|
b1e4e4 |
CMS.debug("SigningAlgDefault: setValue " + e.toString());
|
|
|
b1e4e4 |
throw new EPropertyException(CMS.getUserMessage(
|
|
|
b1e4e4 |
--
|
|
|
b1e4e4 |
1.8.3.1
|
|
|
b1e4e4 |
|