Merge 0.10->trunk

[prosody.git] / certs / Makefile

diff --git a/certs/Makefile b/certs/Makefile
index 6ffb6bd7cde78816053d7db7de84678c1620b3ec..b3011a89ddc3ff7a1eaec22d9e9fc0168dd739d3 100644 (file)
--- a/certs/Makefile
+++ b/certs/Makefile
@@ -45,8 +45,7 @@ keysize=2048
        @chmod 400 $*.key -c
 
 %.crt: %.key
-       openssl req -new -x509 -nodes -key $^ -days 365 \
-               -sha256 -out $@ -utf8 -config $(firstword $^)
+       openssl req -new -x509 -key $^ -days 365 -sha256 -utf8 -subj /CN=$* -out $@
 
 %.crt:
        umask 0077 && touch $*.key
@@ -59,5 +58,9 @@ keysize=2048
        sed 's,example\.com,$*,g' openssl.cnf > $@
 
 %.key:
-       openssl genrsa $(keysize) > $@
-       @chmod 400 $@
+       umask 0077 && openssl genrsa -out $@ $(keysize)
+       @chmod 400 $@ -c
+
+# Generate Diffie-Hellman parameters
+dh-%.pem:
+       openssl dhparam -out $@ $*