# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1444586415 -7200
# Node ID 633af47470c8a43639f825c3cde14bfef682209f
# Parent  5ff42d85d4d5134db4188deb1f50681501947fb8# Parent  d2d7ad2563f9a08139ead0f0c86e4b8d687e2a8a
Merge 0.9->0.10

diff -r 5ff42d85d4d5 -r 633af47470c8 util/openssl.lua
--- 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 = {},