|
 |
7a8c6d |
From 43392d48924d6d50ef2712947ddea424e723e171 Mon Sep 17 00:00:00 2001
|
|
|
7a8c6d |
From: Trevor Vaughan <tvaughan@onyxpoint.com>
|
|
|
7a8c6d |
Date: Tue, 27 Mar 2018 09:28:28 -0400
|
|
|
7a8c6d |
Subject: [PATCH 23/25] Updates per Feedback
|
|
|
7a8c6d |
|
|
|
7a8c6d |
Ref: #89
|
|
|
7a8c6d |
---
|
|
|
7a8c6d |
src/scepgen-o.c | 9 +++++----
|
|
|
7a8c6d |
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
7a8c6d |
|
|
|
7a8c6d |
diff --git a/src/scepgen-o.c b/src/scepgen-o.c
|
|
|
7a8c6d |
index 07c2b8b..05fc437 100644
|
|
|
7a8c6d |
--- a/src/scepgen-o.c
|
|
|
7a8c6d |
+++ b/src/scepgen-o.c
|
|
|
7a8c6d |
@@ -457,7 +457,7 @@ cm_scepgen_o_cooked(struct cm_store_ca *ca, struct cm_store_entry *entry,
|
|
|
7a8c6d |
_exit(1);
|
|
|
7a8c6d |
}
|
|
|
7a8c6d |
|
|
|
7a8c6d |
- cm_log(1, "SCEP cipher authoritatively set to: '%s'\n", scep_cipher);
|
|
|
7a8c6d |
+ cm_log(1, "SCEP cipher set from configuration to: '%s'\n", scep_cipher);
|
|
|
7a8c6d |
}
|
|
|
7a8c6d |
else {
|
|
|
7a8c6d |
cipher = cm_prefs_nocipher;
|
|
|
7a8c6d |
@@ -527,11 +527,11 @@ cm_scepgen_o_cooked(struct cm_store_ca *ca, struct cm_store_entry *entry,
|
|
|
7a8c6d |
digest = cm_prefs_md5;
|
|
|
7a8c6d |
}
|
|
|
7a8c6d |
else {
|
|
|
7a8c6d |
- cm_log(1, "Option 'scep_digest' must be one of AES256, AES192, AES128, DES3, or DES. Got '%s'\n", scep_digest);
|
|
|
7a8c6d |
+ cm_log(1, "Option 'scep_digest' must be one of SHA512, SHA384, SHA256, SHA1, or MD5. Got '%s'\n", scep_digest);
|
|
|
7a8c6d |
_exit(1);
|
|
|
7a8c6d |
}
|
|
|
7a8c6d |
|
|
|
7a8c6d |
- cm_log(1, "SCEP digest authoritatively set to: '%s'\n", scep_digest);
|
|
|
7a8c6d |
+ cm_log(1, "SCEP digest set from configuration to: '%s'\n", scep_digest);
|
|
|
7a8c6d |
}
|
|
|
7a8c6d |
else {
|
|
|
7a8c6d |
pref_digest = cm_prefs_preferred_digest();
|
|
|
7a8c6d |
@@ -578,7 +578,8 @@ cm_scepgen_o_cooked(struct cm_store_ca *ca, struct cm_store_entry *entry,
|
|
|
7a8c6d |
}
|
|
|
7a8c6d |
}
|
|
|
7a8c6d |
if (digest == cm_prefs_nodigest) {
|
|
|
7a8c6d |
- /* Per the latest Draft RFC */
|
|
|
7a8c6d |
+ /* Per SCEP RFC draft-gutmann-scep-10 - March 1, 2018 */
|
|
|
7a8c6d |
+ /* https://www.ietf.org/id/draft-gutmann-scep-10.txt */
|
|
|
7a8c6d |
cm_log(1, "Could not determine supported CA capabilities, using SHA256.\n");
|
|
|
7a8c6d |
digest = cm_prefs_sha256;
|
|
|
7a8c6d |
}
|
|
|
7a8c6d |
--
|
|
|
7a8c6d |
1.8.3.1
|
|
|
7a8c6d |
|