Merge remote-tracking branch 'origin/master' into next

[people/pmueller/ipfire-2.x.git] / config / ssl / openssl.cnf

diff --git a/config/ssl/openssl.cnf b/config/ssl/openssl.cnf
index 092923fca5a9d433dc269e4d5e5db60ed1b9cfcc..9d1e6e1ff5e5510483af261cb00eced32bb5893a 100644 (file)
--- a/config/ssl/openssl.cnf
+++ b/config/ssl/openssl.cnf
@@ -7,10 +7,10 @@ oid_section   = new_oids
 [ ca ]
 default_ca     = IPFire
 
-[ IPCop ]
+[ IPFire ]
 dir            = /var/ipfire
 certs          = $dir/certs
-crl_dir                = $dir/crls
+crl_dir        = $dir/crls
 database       = $dir/certs/index.txt
 new_certs_dir  = $dir/certs
 certificate    = $dir/ca/cacert.pem
@@ -21,7 +21,7 @@ RANDFILE      = $dir/tmp/.rand
 x509_extensions        = usr_cert
 default_days   = 999999
 default_crl_days= 30
-default_md     = md5
+default_md     = sha256
 preserve       = no
 policy         = policy_match
 email_in_dn    = no
@@ -35,7 +35,7 @@ commonName            = supplied
 emailAddress           = optional
 
 [ req ]
-default_bits           = 1024
+default_bits           = 2048
 default_keyfile        = privkey.pem
 distinguished_name     = req_distinguished_name
 attributes             = req_attributes
@@ -44,9 +44,9 @@ string_mask = nombstr
 
 [ req_distinguished_name ]
 countryName                    = Country Name (2 letter code)
-countryName_default            = GB
-countryName_min                        = 2
-countryName_max                        = 2
+countryName_default            = DE
+countryName_min                = 2
+countryName_max                = 2
 
 stateOrProvinceName            = State or Province Name (full name)
 stateOrProvinceName_default    = 
@@ -55,21 +55,21 @@ localityName                        = Locality Name (eg, city)
 #localityName_default          = 
 
 0.organizationName             = Organization Name (eg, company)
-0.organizationName_default     = My Company Ltd
+0.organizationName_default     = IPFire
 
 organizationalUnitName         = Organizational Unit Name (eg, section)
 #organizationalUnitName_default        =
 
 commonName                     = Common Name (eg, your name or your server\'s hostname)
-commonName_max                 = 64
+commonName_max         = 64
 
 emailAddress                   = Email Address
 emailAddress_max               = 40
 
 [ req_attributes ]
 challengePassword              = A challenge password
-challengePassword_min          = 4
-challengePassword_max          = 20
+challengePassword_min  = 4
+challengePassword_max  = 20
 unstructuredName               = An optional company name
 
 [ usr_cert ]