rpms/openssl
6
1
Fork 1
Code Issues Pull Requests Releases Activity

allow deinitialization of the FIPS mode

Browse Source
This commit is contained in:
Tomas Mraz 2013-08-29 16:41:24 +02:00
parent 1465572e17
commit b5d2711ab6
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openssl-1.0.1e-fips.patch
View File

@ -19326,7 +19326,7 @@ diff -up openssl-1.0.1e/crypto/o_fips.c.fips openssl-1.0.1e/crypto/o_fips.c
#ifndef FIPS_AUTH_USER_PASS #ifndef FIPS_AUTH_USER_PASS
#define FIPS_AUTH_USER_PASS "Default FIPS Crypto User Password" #define FIPS_AUTH_USER_PASS "Default FIPS Crypto User Password"
#endif #endif
+ if (FIPS_module_mode()) /* can be implicitly initialized by OPENSSL_init() */ + if (r && FIPS_module_mode()) /* can be implicitly initialized by OPENSSL_init() */
+ return 1; + return 1;
if (!FIPS_module_mode_set(r, FIPS_AUTH_USER_PASS)) if (!FIPS_module_mode_set(r, FIPS_AUTH_USER_PASS))
return 0; return 0;

5
openssl.spec
View File

@ -21,7 +21,7 @@
Summary: Utilities from the general purpose cryptography library with TLS implementation Summary: Utilities from the general purpose cryptography library with TLS implementation
Name: openssl Name: openssl
Version: 1.0.1e Version: 1.0.1e
Release: 17%{?dist} Release: 18%{?dist}
Epoch: 1 Epoch: 1
# We have to remove certain patented algorithms from the openssl source # We have to remove certain patented algorithms from the openssl source
# tarball with the hobble-openssl script which is included below. # tarball with the hobble-openssl script which is included below.
@ -468,6 +468,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipscanister.*
prelink -u %{_libdir}/libcrypto.so.%{version} %{_libdir}/libssl.so.%{version} 2>/dev/null || : prelink -u %{_libdir}/libcrypto.so.%{version} %{_libdir}/libssl.so.%{version} 2>/dev/null || :
%changelog %changelog
* Thu Aug 29 2013 Tomas Mraz <tmraz@redhat.com> 1.0.1e-18
- allow deinitialization of the FIPS mode
* Thu Aug 29 2013 Tomas Mraz <tmraz@redhat.com> 1.0.1e-17 * Thu Aug 29 2013 Tomas Mraz <tmraz@redhat.com> 1.0.1e-17
- always perform the FIPS selftests in library constructor - always perform the FIPS selftests in library constructor
if FIPS module is installed if FIPS module is installed