From a7876b3541a286c7a6438364723b127bed7762d9 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 1 Oct 2024 09:03:58 +0000 Subject: [PATCH] Import from CS git --- SOURCES/1002-vendor-use-pbkdf2-from-OpenSSL.patch | 4 ++-- SPECS/grafana.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/SOURCES/1002-vendor-use-pbkdf2-from-OpenSSL.patch b/SOURCES/1002-vendor-use-pbkdf2-from-OpenSSL.patch index 48a4536..aa4b421 100644 --- a/SOURCES/1002-vendor-use-pbkdf2-from-OpenSSL.patch +++ b/SOURCES/1002-vendor-use-pbkdf2-from-OpenSSL.patch @@ -2,7 +2,7 @@ use pbkdf2 from OpenSSL if FIPS mode is enabled This patch modifies the x/crypto/pbkdf2 function to use OpenSSL if FIPS mode is enabled. -DEFINEFUNC is from /usr/lib/golang/src/vendor/github.com/golang-fips/openssl-fips/openssl/goopenssl.h +DEFINEFUNC is from /usr/lib/golang/src/vendor/github.com/golang-fips/openssl/openssl/goopenssl.h diff --git a/vendor/golang.org/x/crypto/internal/boring/boring.go b/vendor/golang.org/x/crypto/internal/boring/boring.go new file mode 100644 @@ -112,7 +112,7 @@ index 0000000000..6dfdf10424 --- /dev/null +++ b/vendor/golang.org/x/crypto/internal/boring/openssl_pbkdf2.h @@ -0,0 +1,5 @@ -+#include "/usr/lib/golang/src/vendor/github.com/golang-fips/openssl-fips/openssl/goopenssl.h" ++#include "/usr/lib/golang/src/vendor/github.com/golang-fips/openssl/openssl/goopenssl.h" + +DEFINEFUNC(int, PKCS5_PBKDF2_HMAC, + (const char *pass, int passlen, const unsigned char *salt, int saltlen, int iter, EVP_MD *digest, int keylen, unsigned char *out), diff --git a/SPECS/grafana.spec b/SPECS/grafana.spec index b6f4e18..c58a5a5 100644 --- a/SPECS/grafana.spec +++ b/SPECS/grafana.spec @@ -35,7 +35,7 @@ end} Name: grafana Version: 9.2.10 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Metrics dashboard and graph editor License: AGPLv3 URL: https://grafana.org @@ -1021,6 +1021,9 @@ fi %{_datadir}/selinux/*/grafana.pp %changelog +* Mon Jul 22 2024 Lauren Chilton 9.2.10-18 +- Resolves RHEL-47191 + * Wed Jun 26 2024 Sam Feifer 9.2.10-17 - Allow for mssql datasource in selinux policy - Resolves RHEL-43435