forked from pool/openssl-3
Pedro Monreal Gonzalez
8a00581af4
* Changes:
- Default encryption cipher for the req, cms, and smime applications
changed from des-ede3-cbc to aes-256-cbc.
- The default TLS supported groups list has been changed to include
and prefer hybrid PQC KEM groups. Some practically unused groups
were removed from the default list.
- The default TLS keyshares have been changed to offer X25519MLKEM768
and and X25519.
- All BIO_meth_get_*() functions were deprecated.
* New features:
- Support for server side QUIC (RFC 9000)
- Support for 3rd party QUIC stacks including 0-RTT support
- Support for PQC algorithms (ML-KEM, ML-DSA and SLH-DSA)
- A new configuration option no-tls-deprecated-ec to disable support
for TLS groups deprecated in RFC8422
- A new configuration option enable-fips-jitter to make the FIPS
provider to use the JITTER seed source
- Support for central key generation in CMP
- Support added for opaque symmetric key objects (EVP_SKEY)
- Support for multiple TLS keyshares and improved TLS key establishment
group configurability
- API support for pipelining in provided cipher algorithms
* Remove patches:
- openssl-3-disable-hmac-hw-acceleration-with-engine-digest.patch
- openssl-3-support-CPACF-sha3-shake-perf-improvement.patch
- openssl-3-add-defines-CPACF-funcs.patch
- openssl-3-fix-memleak-s390x_HMAC_CTX_copy.patch
- openssl-3-add-xof-state-handling-s3_absorb.patch
- openssl-3-fix-state-handling-sha3_absorb_s390x.patch
OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-3?expand=0&rev=139
93 lines
2.4 KiB
Diff
93 lines
2.4 KiB
Diff
From 0e3f6972299bc243023c6ce38663948317bd6794 Mon Sep 17 00:00:00 2001
|
|
From: rpm-build <rpm-build>
|
|
Date: Wed, 6 Mar 2024 19:17:15 +0100
|
|
Subject: [PATCH 10/53] RH: Add Kernel FIPS mode flag support - FIXSTYLE
|
|
|
|
Patch-name: 0009-Add-Kernel-FIPS-mode-flag-support.patch
|
|
Patch-id: 9
|
|
Patch-status: |
|
|
# # Add check to see if fips flag is enabled in kernel
|
|
From-dist-git-commit: 4334bc837fbc64d14890fdc51679a80770d498ce
|
|
---
|
|
crypto/context.c | 35 +++++++++++++++++++++++++++++++++++
|
|
include/internal/provider.h | 3 +++
|
|
2 files changed, 38 insertions(+)
|
|
|
|
diff --git a/crypto/context.c b/crypto/context.c
|
|
index f15bc3d755..614c8a2c88 100644
|
|
--- a/crypto/context.c
|
|
+++ b/crypto/context.c
|
|
@@ -7,6 +7,7 @@
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
+#define _GNU_SOURCE /* needed for secure_getenv */
|
|
#include "crypto/cryptlib.h"
|
|
#include <openssl/conf.h>
|
|
#include <openssl/trace.h>
|
|
@@ -19,6 +20,38 @@
|
|
#include "crypto/decoder.h"
|
|
#include "crypto/context.h"
|
|
|
|
+# include <sys/types.h>
|
|
+# include <sys/stat.h>
|
|
+# include <fcntl.h>
|
|
+# include <unistd.h>
|
|
+# include <openssl/evp.h>
|
|
+
|
|
+# define FIPS_MODE_SWITCH_FILE "/proc/sys/crypto/fips_enabled"
|
|
+
|
|
+static int kernel_fips_flag;
|
|
+
|
|
+static void read_kernel_fips_flag(void)
|
|
+{
|
|
+ char buf[2] = "0";
|
|
+ int fd;
|
|
+
|
|
+ if (secure_getenv("OPENSSL_FORCE_FIPS_MODE") != NULL) {
|
|
+ buf[0] = '1';
|
|
+ } else if ((fd = open(FIPS_MODE_SWITCH_FILE, O_RDONLY)) >= 0) {
|
|
+ while (read(fd, buf, sizeof(buf)) < 0 && errno == EINTR) ;
|
|
+ close(fd);
|
|
+ }
|
|
+
|
|
+ if (buf[0] == '1') {
|
|
+ kernel_fips_flag = 1;
|
|
+ }
|
|
+}
|
|
+
|
|
+int ossl_get_kernel_fips_flag()
|
|
+{
|
|
+ return kernel_fips_flag;
|
|
+}
|
|
+
|
|
struct ossl_lib_ctx_st {
|
|
CRYPTO_RWLOCK *lock;
|
|
OSSL_EX_DATA_GLOBAL global;
|
|
@@ -393,6 +426,8 @@ static int default_context_inited = 0;
|
|
|
|
DEFINE_RUN_ONCE_STATIC(default_context_do_init)
|
|
{
|
|
+ read_kernel_fips_flag();
|
|
+
|
|
if (!CRYPTO_THREAD_init_local(&default_context_thread_local, NULL))
|
|
goto err;
|
|
|
|
diff --git a/include/internal/provider.h b/include/internal/provider.h
|
|
index 6909a1919c..9d2e355251 100644
|
|
--- a/include/internal/provider.h
|
|
+++ b/include/internal/provider.h
|
|
@@ -111,6 +111,9 @@ int ossl_provider_init_as_child(OSSL_LIB_CTX *ctx,
|
|
const OSSL_DISPATCH *in);
|
|
void ossl_provider_deinit_child(OSSL_LIB_CTX *ctx);
|
|
|
|
+/* FIPS flag access */
|
|
+int ossl_get_kernel_fips_flag(void);
|
|
+
|
|
# ifdef __cplusplus
|
|
}
|
|
# endif
|
|
--
|
|
2.49.0
|
|
|