forked from pool/openssl-3
Pedro Monreal Gonzalez
6bc57d937f
* SHA-1 is not allowed anymore in FIPS 186-5 for signature
verification operations. After 12/31/2030, NIST will disallow
SHA-1 for all of its usages.
* Add openssl-3-FIPS-Deny-SHA-1-sigver-in-FIPS-provider.patch
- FIPS: RSA keygen PCT requirements.
* Skip the rsa_keygen_pairwise_test() PCT in rsa_keygen() as the
self-test requirements are covered by do_rsa_pct() for both
RSA-OAEP and RSA signatures [bsc#1221760]
* Enforce error state if rsa_keygen PCT is run and fails [bsc#1221753]
* Add openssl-3-FIPS-PCT_rsa_keygen.patch
- FIPS: Check that the fips provider is available before setting
it as the default provider in FIPS mode. [bsc#1220523]
* Rebase openssl-Force-FIPS.patch
- FIPS: Port openssl to use jitterentropy [bsc#1220523]
* Set the module in error state if the jitter RNG fails either on
initialization or entropy gathering because health tests failed.
* Add jitterentropy as a seeding source output also in crypto/info.c
* Move the jitter entropy collector and the associated lock out
of the header file to avoid redefinitions.
* Add the fips_local.cnf symlink to the spec file. This simlink
points to the openssl_fips.config file that is provided by the
crypto-policies package.
* Rebase openssl-3-jitterentropy-3.4.0.patch
* Rebase openssl-FIPS-enforce-EMS-support.patch
- FIPS: Block non-Approved Elliptic Curves [bsc#1221786]
OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-3?expand=0&rev=110
99 lines
4.8 KiB
Diff
99 lines
4.8 KiB
Diff
From 589eb3898896c1ac916bc20069ecd5adb8534850 Mon Sep 17 00:00:00 2001
|
|
From: Clemens Lang <cllang@redhat.com>
|
|
Date: Fri, 17 Feb 2023 15:31:08 +0100
|
|
Subject: [PATCH] GCM: Implement explicit FIPS indicator for IV gen
|
|
|
|
Implementation Guidance for FIPS 140-3 and the Cryptographic Module
|
|
Verification Program, Section C.H requires guarantees about the
|
|
uniqueness of key/iv pairs, and proposes a few approaches to ensure
|
|
this. Provide an indicator for option 2 "The IV may be generated
|
|
internally at its entirety randomly."
|
|
|
|
Resolves: rhbz#2168289
|
|
Signed-off-by: Clemens Lang <cllang@redhat.com>
|
|
---
|
|
include/openssl/core_names.h | 1 +
|
|
include/openssl/evp.h | 4 +++
|
|
.../implementations/ciphers/ciphercommon.c | 4 +++
|
|
.../ciphers/ciphercommon_gcm.c | 25 +++++++++++++++++++
|
|
4 files changed, 34 insertions(+)
|
|
|
|
Index: openssl-3.1.4/include/openssl/core_names.h
|
|
===================================================================
|
|
--- openssl-3.1.4.orig/include/openssl/core_names.h
|
|
+++ openssl-3.1.4/include/openssl/core_names.h
|
|
@@ -99,6 +99,7 @@ extern "C" {
|
|
#define OSSL_CIPHER_PARAM_CTS_MODE "cts_mode" /* utf8_string */
|
|
/* For passing the AlgorithmIdentifier parameter in DER form */
|
|
#define OSSL_CIPHER_PARAM_ALGORITHM_ID_PARAMS "alg_id_param" /* octet_string */
|
|
+#define OSSL_CIPHER_PARAM_SUSE_FIPS_INDICATOR "suse-fips-indicator" /* int */
|
|
|
|
#define OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_MAX_SEND_FRAGMENT \
|
|
"tls1multi_maxsndfrag" /* uint */
|
|
Index: openssl-3.1.4/include/openssl/evp.h
|
|
===================================================================
|
|
--- openssl-3.1.4.orig/include/openssl/evp.h
|
|
+++ openssl-3.1.4/include/openssl/evp.h
|
|
@@ -750,6 +750,10 @@ void EVP_CIPHER_CTX_set_flags(EVP_CIPHER
|
|
void EVP_CIPHER_CTX_clear_flags(EVP_CIPHER_CTX *ctx, int flags);
|
|
int EVP_CIPHER_CTX_test_flags(const EVP_CIPHER_CTX *ctx, int flags);
|
|
|
|
+# define EVP_CIPHER_SUSE_FIPS_INDICATOR_UNDETERMINED 0
|
|
+# define EVP_CIPHER_SUSE_FIPS_INDICATOR_APPROVED 1
|
|
+# define EVP_CIPHER_SUSE_FIPS_INDICATOR_NOT_APPROVED 2
|
|
+
|
|
__owur int EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
|
|
const unsigned char *key, const unsigned char *iv);
|
|
/*__owur*/ int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,
|
|
Index: openssl-3.1.4/providers/implementations/ciphers/ciphercommon.c
|
|
===================================================================
|
|
--- openssl-3.1.4.orig/providers/implementations/ciphers/ciphercommon.c
|
|
+++ openssl-3.1.4/providers/implementations/ciphers/ciphercommon.c
|
|
@@ -149,6 +149,10 @@ static const OSSL_PARAM cipher_aead_know
|
|
OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, NULL, 0),
|
|
OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD_PAD, NULL),
|
|
OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_GET_IV_GEN, NULL, 0),
|
|
+ /* normally we would hide this under an #ifdef FIPS_MODULE, but that does
|
|
+ * not work in ciphercommon.c because it is compiled only once into
|
|
+ * libcommon.a */
|
|
+ OSSL_PARAM_int(OSSL_CIPHER_PARAM_SUSE_FIPS_INDICATOR, NULL),
|
|
OSSL_PARAM_END
|
|
};
|
|
const OSSL_PARAM *ossl_cipher_aead_gettable_ctx_params(
|
|
Index: openssl-3.1.4/providers/implementations/ciphers/ciphercommon_gcm.c
|
|
===================================================================
|
|
--- openssl-3.1.4.orig/providers/implementations/ciphers/ciphercommon_gcm.c
|
|
+++ openssl-3.1.4/providers/implementations/ciphers/ciphercommon_gcm.c
|
|
@@ -224,6 +224,31 @@ int ossl_gcm_get_ctx_params(void *vctx,
|
|
|| !getivgen(ctx, p->data, p->data_size))
|
|
return 0;
|
|
}
|
|
+
|
|
+ /* We would usually hide this under #ifdef FIPS_MODULE, but
|
|
+ * ciphercommon_gcm.c is only compiled once into libcommon.a, so ifdefs do
|
|
+ * not work here. */
|
|
+ p = OSSL_PARAM_locate(params, OSSL_CIPHER_PARAM_SUSE_FIPS_INDICATOR);
|
|
+ if (p != NULL) {
|
|
+ int fips_indicator = EVP_CIPHER_SUSE_FIPS_INDICATOR_APPROVED;
|
|
+
|
|
+ /* Implementation Guidance for FIPS 140-3 and the Cryptographic Module
|
|
+ * Verification Program, Section C.H requires guarantees about the
|
|
+ * uniqueness of key/iv pairs, and proposes a few approaches to ensure
|
|
+ * this. This provides an indicator for option 2 "The IV may be
|
|
+ * generated internally at its entirety randomly." Note that one of the
|
|
+ * conditions of this option is that "The IV length shall be at least
|
|
+ * 96 bits (per SP 800-38D)." We do not specically check for this
|
|
+ * condition here, because gcm_iv_generate will fail in this case. */
|
|
+ if (ctx->enc && !ctx->iv_gen_rand)
|
|
+ fips_indicator = EVP_CIPHER_SUSE_FIPS_INDICATOR_NOT_APPROVED;
|
|
+
|
|
+ if (!OSSL_PARAM_set_int(p, fips_indicator)) {
|
|
+ ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER);
|
|
+ return 0;
|
|
+ }
|
|
+ }
|
|
+
|
|
return 1;
|
|
}
|
|
|