Fixup example certs

diff --git a/raddb/certs/ca.cnf b/raddb/certs/ca.cnf
index 59b8fad39428011ec89403b88d7916a8c631d8aa..104850533f21a6b948ea3579e30e05e1547b2c8b 100644 (file)
--- a/raddb/certs/ca.cnf
+++ b/raddb/certs/ca.cnf
@@ -50,7 +50,7 @@ x509_extensions               = v3_ca
 countryName            = FR
 stateOrProvinceName    = Radius
 localityName           = Somewhere
-organizationName       = Example Inc.
+organizationName       = Example Inc
 emailAddress           = admin@example.org
 commonName             = "Example Certificate Authority"
 

diff --git a/raddb/certs/client.cnf b/raddb/certs/client.cnf
index c5b31a56999b0a312d537b2744e1d79cb83d9d5d..8f0f811f558f19aab48fab78b9921fd6d513d1d5 100644 (file)
--- a/raddb/certs/client.cnf
+++ b/raddb/certs/client.cnf
@@ -36,7 +36,8 @@ stateOrProvinceName   = optional
 localityName           = optional
 organizationName       = optional
 organizationalUnitName = optional
-commonName             = supplied
+commonName             = optional
+subjectAltName         = supplied
 emailAddress           = optional
 
 [ req ]
@@ -50,9 +51,12 @@ output_password              = whatever
 countryName            = FR
 stateOrProvinceName    = Radius
 localityName           = Somewhere
-organizationName       = Example Inc.
-emailAddress           = user@example.org
-commonName             = user@example.org
+organizationName       = Example Inc
+emailAddress           = user.example@example.org
+commonName             = Example user
+
+# Should be the user's NAI as per RFC 5216 (EAP-TLS)
+subjectAltName         = user@example.org
 
 [ v3_client ]
 basicConstraints       = CA:FALSE

diff --git a/raddb/certs/ocsp.cnf b/raddb/certs/ocsp.cnf
index 0925934bdfe7747241daa7f48b0983b0a05acc18..7ae72645654b239def65afe96e7f2742ed4b7914 100644 (file)
--- a/raddb/certs/ocsp.cnf
+++ b/raddb/certs/ocsp.cnf
@@ -50,9 +50,10 @@ output_password              = whatever
 countryName            = FR
 stateOrProvinceName    = Radius
 localityName           = Somewhere
-organizationName       = Example Inc.
+organizationName       = Example Inc
 emailAddress           = admin@example.org
 commonName             = "Example OCSP Responder Certificate"
+subjectAltName         = ocsp.example.org
 
 [ v3_ocsp ]
 basicConstraints       = CA:FALSE

diff --git a/raddb/certs/server.cnf b/raddb/certs/server.cnf
index f2d9fef5a213560dc77bfefb07146d34d62b01a3..5a8237f277e9796581f25ce80a59672fe68bb38c 100644 (file)
--- a/raddb/certs/server.cnf
+++ b/raddb/certs/server.cnf
@@ -50,9 +50,10 @@ output_password              = whatever
 countryName            = FR
 stateOrProvinceName    = Radius
 localityName           = Somewhere
-organizationName       = Example Inc.
+organizationName       = Example Inc
 emailAddress           = admin@example.org
 commonName             = "Example Server Certificate"
+subjectAltName         = radius.example.org
 
 [ v3_radius ]
 basicConstraints       = CA:FALSE