jonathan/openssl
1
0
Fork 0
forked from rpms/openssl
Code Pull Requests Activity

new upstream release fixing multiple CVEs

Browse Source
This commit is contained in:
Tomas Mraz 2012-01-05 15:13:25 +01:00
parent c28bd1cc5f
commit ea1d432ecf
4 changed files with 425 additions and 437 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openssl-1.0.0d-cms-keyid.patch
View File

@ -1,12 +0,0 @@
diff -up openssl-1.0.0d/apps/cms.c.keyid openssl-1.0.0d/apps/cms.c
--- openssl-1.0.0d/apps/cms.c.keyid 2009-10-18 16:42:26.000000000 +0200
+++ openssl-1.0.0d/apps/cms.c 2011-07-26 12:56:48.000000000 +0200
@@ -618,7 +618,7 @@ int MAIN(int argc, char **argv)
BIO_printf (bio_err, "-certsout file certificate output file\n");
BIO_printf (bio_err, "-signer file signer certificate file\n");
BIO_printf (bio_err, "-recip file recipient certificate file for decryption\n");
- BIO_printf (bio_err, "-skeyid use subject key identifier\n");
+ BIO_printf (bio_err, "-keyid use subject key identifier\n");
BIO_printf (bio_err, "-in file input file\n");
BIO_printf (bio_err, "-inform arg input format SMIME (default), PEM or DER\n");
BIO_printf (bio_err, "-inkey file input private key (if not signer or recipient)\n");

8
openssl-1.0.0-beta3-defaults.patch → openssl-1.0.0f-defaults.patch
View File

@ -1,6 +1,6 @@
diff -up openssl-1.0.0-beta3/apps/openssl.cnf.defaults openssl-1.0.0-beta3/apps/openssl.cnf
--- openssl-1.0.0-beta3/apps/openssl.cnf.defaults 2009-04-04 20:09:43.000000000 +0200
+++ openssl-1.0.0-beta3/apps/openssl.cnf 2009-08-04 22:57:16.000000000 +0200
diff -up openssl-1.0.0f/apps/openssl.cnf.defaults openssl-1.0.0f/apps/openssl.cnf
--- openssl-1.0.0f/apps/openssl.cnf.defaults 2011-12-06 01:01:00.000000000 +0100
+++ openssl-1.0.0f/apps/openssl.cnf 2012-01-05 13:16:15.000000000 +0100
@@ -103,7 +103,8 @@ emailAddress = optional
####################################################################
@ -37,7 +37,7 @@ diff -up openssl-1.0.0-beta3/apps/openssl.cnf.defaults openssl-1.0.0-beta3/apps/
organizationalUnitName = Organizational Unit Name (eg, section)
#organizationalUnitName_default =
-commonName = Common Name (eg, YOUR name)
-commonName = Common Name (e.g. server FQDN or YOUR name)
+commonName = Common Name (eg, your name or your server\'s hostname)
commonName_max = 64

830
openssl-1.0.0a-fips.patch → openssl-1.0.0f-fips.patch
View File

File diff suppressed because it is too large Load Diff

12
openssl-1.0.0e-version.patch → openssl-1.0.0f-version.patch
View File

@ -1,22 +1,22 @@
diff -up openssl-1.0.0e/crypto/opensslv.h.version openssl-1.0.0e/crypto/opensslv.h
--- openssl-1.0.0e/crypto/opensslv.h.version 2011-09-07 13:55:52.000000000 +0200
+++ openssl-1.0.0e/crypto/opensslv.h 2011-09-07 13:59:28.000000000 +0200
diff -up openssl-1.0.0f/crypto/opensslv.h.version openssl-1.0.0f/crypto/opensslv.h
--- openssl-1.0.0f/crypto/opensslv.h.version 2012-01-05 13:28:32.000000000 +0100
+++ openssl-1.0.0f/crypto/opensslv.h 2012-01-05 13:29:37.000000000 +0100
@@ -25,7 +25,8 @@
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
* major minor fix final patch/beta)
*/
-#define OPENSSL_VERSION_NUMBER 0x1000005fL
-#define OPENSSL_VERSION_NUMBER 0x1000006fL
+/* we have to keep the version number to not break the abi */
+#define OPENSSL_VERSION_NUMBER 0x10000003
#ifdef OPENSSL_FIPS
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0e-fips 6 Sep 2011"
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0f-fips 4 Jan 2012"
#else
@@ -83,7 +84,7 @@
* should only keep the versions that are binary compatible with the current.
*/
#define SHLIB_VERSION_HISTORY ""
-#define SHLIB_VERSION_NUMBER "1.0.0"
+#define SHLIB_VERSION_NUMBER "1.0.0e"
+#define SHLIB_VERSION_NUMBER "1.0.0f"
#endif /* HEADER_OPENSSLV_H */