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