forked from rpms/openssl
new upstream release fixing CVE-2011-3207 (#736088)
This commit is contained in:
parent
4c970c62c5
commit
3447c41c99
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@ openssl-1.0.0a-usa.tar.bz2
|
|||||||
/openssl-1.0.0b-usa.tar.bz2
|
/openssl-1.0.0b-usa.tar.bz2
|
||||||
/openssl-1.0.0c-usa.tar.bz2
|
/openssl-1.0.0c-usa.tar.bz2
|
||||||
/openssl-1.0.0d-usa.tar.bz2
|
/openssl-1.0.0d-usa.tar.bz2
|
||||||
|
/openssl-1.0.0e-usa.tar.bz2
|
||||||
|
@ -1,22 +1,22 @@
|
|||||||
diff -up openssl-1.0.0d/crypto/opensslv.h.version openssl-1.0.0d/crypto/opensslv.h
|
diff -up openssl-1.0.0e/crypto/opensslv.h.version openssl-1.0.0e/crypto/opensslv.h
|
||||||
--- openssl-1.0.0d/crypto/opensslv.h.version 2011-02-10 14:24:52.000000000 +0100
|
--- openssl-1.0.0e/crypto/opensslv.h.version 2011-09-07 13:55:52.000000000 +0200
|
||||||
+++ openssl-1.0.0d/crypto/opensslv.h 2011-02-10 14:48:00.000000000 +0100
|
+++ openssl-1.0.0e/crypto/opensslv.h 2011-09-07 13:59:28.000000000 +0200
|
||||||
@@ -25,7 +25,8 @@
|
@@ -25,7 +25,8 @@
|
||||||
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
|
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
|
||||||
* major minor fix final patch/beta)
|
* major minor fix final patch/beta)
|
||||||
*/
|
*/
|
||||||
-#define OPENSSL_VERSION_NUMBER 0x1000004fL
|
-#define OPENSSL_VERSION_NUMBER 0x1000005fL
|
||||||
+/* we have to keep the version number to not break the abi */
|
+/* we have to keep the version number to not break the abi */
|
||||||
+#define OPENSSL_VERSION_NUMBER 0x10000003
|
+#define OPENSSL_VERSION_NUMBER 0x10000003
|
||||||
#ifdef OPENSSL_FIPS
|
#ifdef OPENSSL_FIPS
|
||||||
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0d-fips 8 Feb 2011"
|
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0e-fips 6 Sep 2011"
|
||||||
#else
|
#else
|
||||||
@@ -83,7 +84,7 @@
|
@@ -83,7 +84,7 @@
|
||||||
* should only keep the versions that are binary compatible with the current.
|
* should only keep the versions that are binary compatible with the current.
|
||||||
*/
|
*/
|
||||||
#define SHLIB_VERSION_HISTORY ""
|
#define SHLIB_VERSION_HISTORY ""
|
||||||
-#define SHLIB_VERSION_NUMBER "1.0.0"
|
-#define SHLIB_VERSION_NUMBER "1.0.0"
|
||||||
+#define SHLIB_VERSION_NUMBER "1.0.0d"
|
+#define SHLIB_VERSION_NUMBER "1.0.0e"
|
||||||
|
|
||||||
|
|
||||||
#endif /* HEADER_OPENSSLV_H */
|
#endif /* HEADER_OPENSSLV_H */
|
@ -20,8 +20,8 @@
|
|||||||
|
|
||||||
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.0d
|
Version: 1.0.0e
|
||||||
Release: 8%{?dist}
|
Release: 1%{?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}-usa.tar.bz2
|
Source: openssl-%{version}-usa.tar.bz2
|
||||||
@ -61,7 +61,7 @@ Patch45: openssl-0.9.8j-env-nozlib.patch
|
|||||||
Patch47: openssl-1.0.0-beta5-readme-warning.patch
|
Patch47: openssl-1.0.0-beta5-readme-warning.patch
|
||||||
Patch49: openssl-1.0.0-beta4-algo-doc.patch
|
Patch49: openssl-1.0.0-beta4-algo-doc.patch
|
||||||
Patch50: openssl-1.0.0-beta4-dtls1-abi.patch
|
Patch50: openssl-1.0.0-beta4-dtls1-abi.patch
|
||||||
Patch51: openssl-1.0.0d-version.patch
|
Patch51: openssl-1.0.0e-version.patch
|
||||||
Patch52: openssl-1.0.0b-aesni.patch
|
Patch52: openssl-1.0.0b-aesni.patch
|
||||||
Patch53: openssl-1.0.0-name-hash.patch
|
Patch53: openssl-1.0.0-name-hash.patch
|
||||||
Patch54: openssl-1.0.0c-speed-fips.patch
|
Patch54: openssl-1.0.0c-speed-fips.patch
|
||||||
@ -422,6 +422,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipscanister.*
|
|||||||
%postun -p /sbin/ldconfig
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 7 2011 Tomas Mraz <tmraz@redhat.com> 1.0.0e-1
|
||||||
|
- new upstream release fixing CVE-2011-3207 (#736088)
|
||||||
|
|
||||||
* Wed Aug 24 2011 Tomas Mraz <tmraz@redhat.com> 1.0.0d-8
|
* Wed Aug 24 2011 Tomas Mraz <tmraz@redhat.com> 1.0.0d-8
|
||||||
- drop the separate engine for Intel acceleration improvements
|
- drop the separate engine for Intel acceleration improvements
|
||||||
and merge in the AES-NI, SHA1, and RC4 optimizations
|
and merge in the AES-NI, SHA1, and RC4 optimizations
|
||||||
|
Loading…
Reference in New Issue
Block a user