New certificates for WinRT, the DNS subAltName should match the CN

scotthunt · May 6, 2015 · 823611c · 823611c
1 parent 0015b00
commit 823611c
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 43 deletions.
diff --git a/certs/cacert.der b/certs/cacert.der
diff --git a/certs/cacert.pem b/certs/cacert.pem
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIIDyjCCArKgAwIBAgIJAJL2aOPHDId5MA0GCSqGSIb3DQEBCwUAMIGLMRUwEwYD
+MIIDyjCCArKgAwIBAgIJAOS7xPjGsV9iMA0GCSqGSIb3DQEBCwUAMIGLMRUwEwYD
 VQQDDAxJY2UgVGVzdHMgQ0ExDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0Ms
 IEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNV
-BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0xNTA0MDgw
-ODExMjhaFw0yMDA0MDYwODExMjhaMIGLMRUwEwYDVQQDDAxJY2UgVGVzdHMgQ0Ex
+BAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0xNTA1MDYx
+NTI0NThaFw0yMDA1MDQxNTI0NThaMIGLMRUwEwYDVQQDDAxJY2UgVGVzdHMgQ0Ex
 DDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNVBAcMB0p1
 cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJKoZIhvcN
 AQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALaYKlCQFb68+hwVjmcv0tkUn5hCG4PV2ETmUFrHEtF8DqgZ8XI2nq6Lqgol
-zD8s10CzSYn2deVH1pdAJzKYQC+cApEtapIYAEHTQIMUCoPyJcYHmZdOb1sxJ6+j
-bksSv1b1nNMmTVR6RJDrgohVbSK4eflx2T5vGAnpiSrQ2GguVUvgW7qVMxHUZQNM
-lowvvjm62VWQ0/PEh94+LYJrMBax/TGKWBsqVR5blgVuocPmhbmODgQHBYrPQrbP
-BBcJxVeRnB58/M9fwnEu6SLZ+3c7eTADDNdAlfO7v+Q5LrE5KCwLK/h105pRJk8u
-Hm8VSaYLkGGF3ypAvh98+shyLNsCAwEAAaMvMC0wDAYDVR0TBAUwAwEB/zAdBgNV
-HQ4EFgQUjoS1gCu4F6kHu1a0o0iatvzlLAgwDQYJKoZIhvcNAQELBQADggEBAJik
-pMMEsuYQVqQCC0aDgjg38Vrv9P7Gkbf3kmLjjx4Fz1Q7jK481TyxEnimHPdzTjR8
-q3VXlzl/XU9WVzhAFNB4WoCHtHqKKjUVS+fEQkA+phiNbOazmKr1hLIofTRL6T5s
-du2j/6XQXws7y1WawJlpbRMI5oWCS5WO5bl5hNpbCSodV3G8FK01szJJTOdx6JfE
-oLCJy5o7l9TS1cXu91BtNuxibOC96i4qlM3BQOto45IMoSZII1Sp4o1FsOJbYv4O
-y78r3Pf+Ipex1HChVuaPJZAzCz0xxNmmKryx/HXN/1dfg2xHSvDOTvl5CEACdeWb
-cAugbCfwuNfL4kVvirs=
+ggEBAOQtOYRqPebil0uWZ7hWnQLZIwUs6Q/46KFtHMHRSoCArtV9X2uOtgCefp6B
+LV++iDS+ZJX9R+RmN8B3bEv8DPj9n8Em0iLx01v9Dpi548fwpQ1MSv7Ug0n3WZ6F
+w4813LSsBhK1RU5M/gFIBY7SqUdmD67IlEJEVJpZyLNmwJGJg99RZyTFpCjxSfpW
+z5k1YG0R7lY+ADTbfKBjwYHrvlQGWY7KKiukiczqk+KNOl++RfZ1MiyBM3fglwAJ
++qkm1KRY7OMb1Z9dYlDv6YQX29Bw7Cd3tDtwCeUhNep9n603intqunpdJFORbz3M
+P+s/5ZbYgk2rMNBvc/fhFhsf7lUCAwEAAaMvMC0wDAYDVR0TBAUwAwEB/zAdBgNV
+HQ4EFgQUSTtAEWRGGjUJtiTOOPyv5WJIW8UwDQYJKoZIhvcNAQELBQADggEBAH8/
+1U4R0WlVjvAMiES8gdN5Y0uwCkuYcq09qbE4SehKSMmpmCvc0VU2yY3HFgCNk29F
+cnsnX7ymv20zUVgU0e3Rkp11UsNIj3lb0GhtoR6DKadAzhVSRQXQVLt7ibojA8bz
+mkQkjHU7b6sAc1kV1d4xL4eWb3nxqvo8kwxFVlovQCkv/RwTIXILdzowmaJr4g4j
+8oLo9B75NG/Ht2aNEFeLLx1/YKXX2OffKvMhd/Gm+qXj76FOmUpHVH2ZMXAEO+cv
+LzlaN60hDGiilOhFOsQbeZ6x+JM/BvH2n83Q7fDX5ejiA8oTmi04d2vyYBFpUr3j
+qgOWU2EddwwoNWpRCR8=
 -----END CERTIFICATE-----
diff --git a/certs/client.bks b/certs/client.bks
diff --git a/certs/client.jks b/certs/client.jks
diff --git a/certs/client.p12 b/certs/client.p12
diff --git a/certs/makecerts.py b/certs/makecerts.py
@@ -96,14 +96,20 @@ def request(question, newvalue, value):
 # Client certificate
 #
 client = factory.create("client")
-client.save("client.p12").save("client.jks", caalias="cacert").save("client.bks")
+client.save("client.p12").save("client.jks", caalias="cacert")
 
 #
 # Server certificate
 #
 # NOTE: server.pem is used by scripts/TestController.py
 #
 server = factory.create("server", cn = (dns if usedns else ip), ip=ip, dns=dns)
-server.save("server.p12").save("server.jks", caalias="cacert").save("server.bks").save("server.pem")
+server.save("server.p12").save("server.jks", caalias="cacert").save("server.pem")
+
+try:
+    server.save("server.bks")
+    client.save("client.bks")
+except Exception as ex:
+    print("warning: couldn't generate BKS certificates:\n" + str(ex))
 
 factory.destroy()
diff --git a/certs/server.bks b/certs/server.bks
diff --git a/certs/server.jks b/certs/server.jks
diff --git a/certs/server.p12 b/certs/server.p12
diff --git a/certs/server.pem b/certs/server.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----