- make TLS work in the FIPS mode

This commit is contained in:
Tomáš Mráz 2010-02-16 23:21:07 +00:00
parent ad8308995b
commit 7c4ab8ff8e
2 changed files with 6 additions and 2 deletions

View File

@ -11932,10 +11932,11 @@ diff -up openssl-1.0.0-beta5/crypto/whrlpool/whrlpool.h.fips openssl-1.0.0-beta5
diff -up openssl-1.0.0-beta5/crypto/whrlpool/wp_dgst.c.fips openssl-1.0.0-beta5/crypto/whrlpool/wp_dgst.c diff -up openssl-1.0.0-beta5/crypto/whrlpool/wp_dgst.c.fips openssl-1.0.0-beta5/crypto/whrlpool/wp_dgst.c
--- openssl-1.0.0-beta5/crypto/whrlpool/wp_dgst.c.fips 2008-12-29 13:35:49.000000000 +0100 --- openssl-1.0.0-beta5/crypto/whrlpool/wp_dgst.c.fips 2008-12-29 13:35:49.000000000 +0100
+++ openssl-1.0.0-beta5/crypto/whrlpool/wp_dgst.c 2010-02-16 23:42:49.000000000 +0100 +++ openssl-1.0.0-beta5/crypto/whrlpool/wp_dgst.c 2010-02-16 23:42:49.000000000 +0100
@@ -53,8 +53,11 @@ @@ -53,8 +53,12 @@
#include "wp_locl.h" #include "wp_locl.h"
#include <string.h> #include <string.h>
+#include <openssl/err.h>
+#ifdef OPENSSL_FIPS +#ifdef OPENSSL_FIPS
+#include <openssl/fips.h> +#include <openssl/fips.h>
+#endif +#endif

View File

@ -23,7 +23,7 @@
Summary: A general purpose cryptography library with TLS implementation Summary: A general purpose cryptography library with TLS implementation
Name: openssl Name: openssl
Version: 1.0.0 Version: 1.0.0
Release: 0.21.%{beta}%{?dist} Release: 0.22.%{beta}%{?dist}
# We remove certain patented algorithms from the openssl source tarball # We remove certain patented algorithms from the openssl source tarball
# with the hobble-openssl script which is included below. # with the hobble-openssl script which is included below.
Source: openssl-%{version}-%{beta}-usa.tar.bz2 Source: openssl-%{version}-%{beta}-usa.tar.bz2
@ -387,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipscanister.*
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%changelog %changelog
* Tue Feb 16 2010 Tomas Mraz <tmraz@redhat.com> 1.0.0-0.22.beta5
- make TLS work in the FIPS mode
* Fri Feb 12 2010 Tomas Mraz <tmraz@redhat.com> 1.0.0-0.21.beta5 * Fri Feb 12 2010 Tomas Mraz <tmraz@redhat.com> 1.0.0-0.21.beta5
- gracefully handle zero length in assembler implementations of - gracefully handle zero length in assembler implementations of
OPENSSL_cleanse (#564029) OPENSSL_cleanse (#564029)