]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
httpscert: Use regular random source.
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 12 Dec 2013 20:17:53 +0000 (21:17 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 12 Dec 2013 20:17:53 +0000 (21:17 +0100)
Previous to this patch, the kernel image file and internal
configuration settings have been used as a source for random
data, which is not random at all.

src/scripts/httpscert

index fb2d64bace8d9060a3083d847eb54218dac10c27..ff48b602e09b23880d92120e9a1c6c7e3a87d116 100644 (file)
@@ -6,13 +6,9 @@
 # See how we were called.
 case "$1" in
   new)
-       # set temporary random file
-       export RANDFILE=/root/.rnd
        if [ ! -f /etc/httpd/server.key ]; then
                echo "Generating https server key."
-               /usr/bin/openssl genrsa -rand \
-                       /boot/vmlinuz:CONFIG_ROOT/ethernet/settings -out \
-                       /etc/httpd/server.key 1024
+               /usr/bin/openssl genrsa -out /etc/httpd/server.key 1024
        fi
        echo "Generating CSR"
        /bin/cat /etc/certparams | sed "s/HOSTNAME/`hostname -f`/" | /usr/bin/openssl \
@@ -21,9 +17,6 @@ case "$1" in
        /usr/bin/openssl x509 -req -days 999999 -in \
                /etc/httpd/server.csr -signkey /etc/httpd/server.key -out \
                /etc/httpd/server.crt
-       # unset and remove random file
-       export -n RANDFILE
-       rm -f /root/.rnd
        ;;
   read)
        if [ -f /etc/httpd/server.key -a -f /etc/httpd/server.crt -a -f /etc/httpd/server.csr ]; then