Merge 0.10->trunk

[prosody.git] / certs / Makefile

diff --git a/certs/Makefile b/certs/Makefile
index 17b9dfa9c16d805296cebe171da9644228653bbd..b3011a89ddc3ff7a1eaec22d9e9fc0168dd739d3 100644 (file)
--- a/certs/Makefile
+++ b/certs/Makefile
@@ -1,4 +1,4 @@
-.DEFAULT: localhost.cert
+.DEFAULT: localhost.crt
 keysize=2048
 
 # How to:
@@ -8,21 +8,59 @@ keysize=2048
 # Then `make yourhost.key` to create your private key, you can
 # include keysize=number to change the size of the key.
 # Then you can either `make yourhost.csr` to generate a certificate
-# signing request that you can submit to a CA, or `make yourhost.cert`
+# signing request that you can submit to a CA, or `make yourhost.crt`
 # to generate a self signed certificate.
 
+.PRECIOUS: %.cnf %.key
+
 # To request a cert
 %.csr: %.cnf %.key
-       openssl req -new -key $(lastword $^) -out $@ -utf8 -config $(firstword $^)
+       openssl req -new -key $(lastword $^) \
+               -sha256 -utf8 -config $(firstword $^) -out $@
+
+%.csr: %.cnf
+       umask 0077 && touch $*.key
+       openssl req -new -newkey rsa:$(keysize) -nodes -keyout $*.key \
+               -sha256 -utf8 -config $^ -out $@
+       @chmod 400 $*.key -c
+
+%.csr: %.key
+       openssl req -new -key $^ -utf8 -subj /CN=$* -out $@
+
+%.csr:
+       umask 0077 && touch $*.key
+       openssl req -new -newkey rsa:$(keysize) -nodes -keyout $*.key \
+               -utf8 -subj /CN=$* -out $@
+       @chmod 400 $*.key -c
 
 # Self signed
-%.cert: %.cnf %.key
-       openssl req -new -x509 -nodes -key $(lastword $^) -days 365 \
-               -sha1 -out $@ -utf8 -config $(firstword $^)
+%.crt: %.cnf %.key
+       openssl req -new -x509 -key $(lastword $^) -days 365 -sha256 -utf8 \
+               -config $(firstword $^) -out $@
 
+%.crt: %.cnf
+       umask 0077 && touch $*.key
+       openssl req -new -x509 -newkey rsa:$(keysize) -nodes -keyout $*.key \
+               -days 365 -sha256 -utf8 -config $(firstword $^) -out $@
+       @chmod 400 $*.key -c
+
+%.crt: %.key
+       openssl req -new -x509 -key $^ -days 365 -sha256 -utf8 -subj /CN=$* -out $@
+
+%.crt:
+       umask 0077 && touch $*.key
+       openssl req -new -x509 -newkey rsa:$(keysize) -nodes -keyout $*.key \
+               -days 365 -sha256 -out $@ -utf8 -subj /CN=$*
+       @chmod 400 $*.key -c
+
+# Generate a config from the example
 %.cnf:
        sed 's,example\.com,$*,g' openssl.cnf > $@
 
 %.key:
-       openssl genrsa $(keysize) > $@
-       @chmod 400 -c $@
+       umask 0077 && openssl genrsa -out $@ $(keysize)
+       @chmod 400 $@ -c
+
+# Generate Diffie-Hellman parameters
+dh-%.pem:
+       openssl dhparam -out $@ $*