mingw-openssl/openssl-1.0.1e-defaults.patch

diff -up openssl-1.0.1e/apps/openssl.cnf.defaults openssl-1.0.1e/apps/openssl.cnf
--- openssl-1.0.1e/apps/openssl.cnf.defaults	2013-02-11 16:26:04.000000000 +0100
+++ openssl-1.0.1e/apps/openssl.cnf	2014-02-06 18:00:00.170929334 +0100
@@ -72,7 +72,7 @@ cert_opt 	= ca_default		# Certificate fi
 
 default_days	= 365			# how long to certify for
 default_crl_days= 30			# how long before next CRL
-default_md	= default		# use public key default MD
+default_md	= sha256		# use SHA-256 by default
 preserve	= no			# keep passed DN ordering
 
 # A few difference way of specifying how similar the request should look
@@ -103,7 +103,8 @@ emailAddress		= optional
 
 ####################################################################
 [ req ]
-default_bits		= 1024
+default_bits		= 2048
+default_md		= sha256
 default_keyfile 	= privkey.pem
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes
@@ -126,17 +127,18 @@ string_mask = utf8only
 
 [ req_distinguished_name ]
 countryName			= Country Name (2 letter code)
-countryName_default		= AU
+countryName_default		= XX
 countryName_min			= 2
 countryName_max			= 2
 
 stateOrProvinceName		= State or Province Name (full name)
-stateOrProvinceName_default	= Some-State
+#stateOrProvinceName_default	= Default Province
 
 localityName			= Locality Name (eg, city)
+localityName_default		= Default City
 
 0.organizationName		= Organization Name (eg, company)
-0.organizationName_default	= Internet Widgits Pty Ltd
+0.organizationName_default	= Default Company Ltd
 
 # we can do this but it is not needed normally :-)
 #1.organizationName		= Second Organization Name (eg, company)
@@ -145,7 +147,7 @@ localityName			= Locality Name (eg, city
 organizationalUnitName		= Organizational Unit Name (eg, section)
 #organizationalUnitName_default	=
 
-commonName			= Common Name (e.g. server FQDN or YOUR name)
+commonName			= Common Name (eg, your name or your server\'s hostname)
 commonName_max			= 64
 
 emailAddress			= Email Address
@@ -339,7 +341,7 @@ signer_key	= $dir/private/tsakey.pem # T
 default_policy	= tsa_policy1		# Policy if request did not specify it
 					# (optional)
 other_policies	= tsa_policy2, tsa_policy3	# acceptable policies (optional)
-digests		= md5, sha1		# Acceptable message digests (mandatory)
+digests		= sha1, sha256, sha384, sha512	# Acceptable message digests (mandatory)
 accuracy	= secs:1, millisecs:500, microsecs:100	# (optional)
 clock_precision_digits  = 0	# number of digits after dot. (optional)
 ordering		= yes	# Is ordering defined for timestamps?
Synced patches with native openssl-1.0.1e-44.fc21 Fixes CVE-2014-0160 (RHBZ #1085066) 2014-04-09 06:25:44 +00:00			`diff -up openssl-1.0.1e/apps/openssl.cnf.defaults openssl-1.0.1e/apps/openssl.cnf`
			`--- openssl-1.0.1e/apps/openssl.cnf.defaults 2013-02-11 16:26:04.000000000 +0100`
			`+++ openssl-1.0.1e/apps/openssl.cnf 2014-02-06 18:00:00.170929334 +0100`
			`@@ -72,7 +72,7 @@ cert_opt = ca_default # Certificate fi`

			`default_days = 365 # how long to certify for`
			`default_crl_days= 30 # how long before next CRL`
			`-default_md = default # use public key default MD`
			`+default_md = sha256 # use SHA-256 by default`
			`preserve = no # keep passed DN ordering`

			`# A few difference way of specifying how similar the request should look`
- Update to version 1.0.0 beta 3 - Use %global instead of %define - Automatically generate debuginfo subpackage - Merged various changes from the native Fedora package (up to 1.0.0-0.5.beta3) - Don't use the %{_mingw32_make} macro anymore as it's ugly and causes side-effects NOTE: Right now, this package doesn't provide versioned DLL's as the upstream defaults are used and I couldn't find the right spot in the build scripts to realize this (openssl's build system is really messy..). 2009-08-29 16:13:45 +00:00			`@@ -103,7 +103,8 @@ emailAddress = optional`

			`####################################################################`
			`[ req ]`
			`-default_bits = 1024`
			`+default_bits = 2048`
Synced patches with native openssl-1.0.1e-44.fc21 Fixes CVE-2014-0160 (RHBZ #1085066) 2014-04-09 06:25:44 +00:00			`+default_md = sha256`
- Update to version 1.0.0 beta 3 - Use %global instead of %define - Automatically generate debuginfo subpackage - Merged various changes from the native Fedora package (up to 1.0.0-0.5.beta3) - Don't use the %{_mingw32_make} macro anymore as it's ugly and causes side-effects NOTE: Right now, this package doesn't provide versioned DLL's as the upstream defaults are used and I couldn't find the right spot in the build scripts to realize this (openssl's build system is really messy..). 2009-08-29 16:13:45 +00:00			`default_keyfile = privkey.pem`
			`distinguished_name = req_distinguished_name`
			`attributes = req_attributes`
			`@@ -126,17 +127,18 @@ string_mask = utf8only`

			`[ req_distinguished_name ]`
			`countryName = Country Name (2 letter code)`
			`-countryName_default = AU`
			`+countryName_default = XX`
			`countryName_min = 2`
			`countryName_max = 2`

			`stateOrProvinceName = State or Province Name (full name)`
			`-stateOrProvinceName_default = Some-State`
			`+#stateOrProvinceName_default = Default Province`

			`localityName = Locality Name (eg, city)`
Synced patches with native openssl-1.0.1e-44.fc21 Fixes CVE-2014-0160 (RHBZ #1085066) 2014-04-09 06:25:44 +00:00			`+localityName_default = Default City`
- Update to version 1.0.0 beta 3 - Use %global instead of %define - Automatically generate debuginfo subpackage - Merged various changes from the native Fedora package (up to 1.0.0-0.5.beta3) - Don't use the %{_mingw32_make} macro anymore as it's ugly and causes side-effects NOTE: Right now, this package doesn't provide versioned DLL's as the upstream defaults are used and I couldn't find the right spot in the build scripts to realize this (openssl's build system is really messy..). 2009-08-29 16:13:45 +00:00
			`0.organizationName = Organization Name (eg, company)`
			`-0.organizationName_default = Internet Widgits Pty Ltd`
			`+0.organizationName_default = Default Company Ltd`

			`# we can do this but it is not needed normally :-)`
			`#1.organizationName = Second Organization Name (eg, company)`
			`@@ -145,7 +147,7 @@ localityName = Locality Name (eg, city`
			`organizationalUnitName = Organizational Unit Name (eg, section)`
			`#organizationalUnitName_default =`

Added missing patches and removed unused ones 2012-11-09 15:29:44 +00:00			`-commonName = Common Name (e.g. server FQDN or YOUR name)`
- Update to version 1.0.0 beta 3 - Use %global instead of %define - Automatically generate debuginfo subpackage - Merged various changes from the native Fedora package (up to 1.0.0-0.5.beta3) - Don't use the %{_mingw32_make} macro anymore as it's ugly and causes side-effects NOTE: Right now, this package doesn't provide versioned DLL's as the upstream defaults are used and I couldn't find the right spot in the build scripts to realize this (openssl's build system is really messy..). 2009-08-29 16:13:45 +00:00			`+commonName = Common Name (eg, your name or your server\'s hostname)`
			`commonName_max = 64`

			`emailAddress = Email Address`
Synced patches with native openssl-1.0.1e-44.fc21 Fixes CVE-2014-0160 (RHBZ #1085066) 2014-04-09 06:25:44 +00:00			`@@ -339,7 +341,7 @@ signer_key = $dir/private/tsakey.pem # T`
			`default_policy = tsa_policy1 # Policy if request did not specify it`
			`# (optional)`
			`other_policies = tsa_policy2, tsa_policy3 # acceptable policies (optional)`
			`-digests = md5, sha1 # Acceptable message digests (mandatory)`
			`+digests = sha1, sha256, sha384, sha512 # Acceptable message digests (mandatory)`
			`accuracy = secs:1, millisecs:500, microsecs:100 # (optional)`
			`clock_precision_digits = 0 # number of digits after dot. (optional)`
			`ordering = yes # Is ordering defined for timestamps?`