Changeset

6904:633af47470c8

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Sun, 11 Oct 2015 20:00:15 +0200
parents 6903:5ff42d85d4d5 (current diff) 6902:d2d7ad2563f9 (diff)
children 6905:0e81e3dab896 6907:a24c9c1edd67
files
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/util/openssl.lua	Sun Oct 11 19:44:15 2015 +0200
+++ b/util/openssl.lua	Sun Oct 11 20:00:15 2015 +0200
@@ -18,8 +18,8 @@
 	return setmetatable({
 		req = {
 			distinguished_name = "distinguished_name",
-			req_extensions = "v3_extensions",
-			x509_extensions = "v3_extensions",
+			req_extensions = "certrequest",
+			x509_extensions = "selfsigned",
 			prompt = "no",
 		},
 		distinguished_name = {
@@ -31,12 +31,16 @@
 			commonName = "example.com",
 			emailAddress = "xmpp@example.com",
 		},
-		v3_extensions = {
+		certrequest = {
 			basicConstraints = "CA:FALSE",
 			keyUsage = "digitalSignature,keyEncipherment",
 			extendedKeyUsage = "serverAuth,clientAuth",
 			subjectAltName = "@subject_alternative_name",
 		},
+		selfsigned = {
+			basicConstraints = "CA:TRUE",
+			subjectAltName = "@subject_alternative_name",
+		},
 		subject_alternative_name = {
 			DNS = {},
 			otherName = {},