pakfire: use correct tree on x86_64.

[ipfire-2.x.git] / src / scripts / httpscert

diff --git a/src/scripts/httpscert b/src/scripts/httpscert
index 97c6c3ce2bcd4a6a58ea1bc4e50965e8ebee5929..e20f789ed4d8c2e52a9e8bc43f4c5f5c276e1a1b 100644 (file)
--- a/src/scripts/httpscert
+++ b/src/scripts/httpscert
@@ -1,37 +1,29 @@
 #!/bin/sh
 #
-# $Id: httpscert,v 1.1.2.2 2005/12/15 21:59:57 eoberlander Exp $
 # new : generate new certificate
 # read: read issuer in certificate and verify if it is the same as hostname
 
 # 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 4096
        fi
        echo "Generating CSR"
        /bin/cat /etc/certparams | sed "s/HOSTNAME/`hostname -f`/" | /usr/bin/openssl \
                req -new -key /etc/httpd/server.key -out /etc/httpd/server.csr
        echo "Signing certificate"
-       /usr/bin/openssl x509 -req -days 999999 -in \
+       /usr/bin/openssl x509 -req -days 999999 -sha256 -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
                ISSUER=`openssl x509 -in /etc/httpd/server.crt -text -noout | grep Issuer | /usr/bin/cut -f2 -d '='`
                HOSTNAME=`/bin/hostname -f`
                if [ "$ISSUER" != "$HOSTNAME" ]; then
-                       echo "Certificate issuer '$ISSUER' is not the same as the hostname'$HOSTNAME'"
+                       echo "Certificate issuer '$ISSUER' is not the same as the hostname '$HOSTNAME'"
                        echo "Probably host or domain name has been changed in setup"
                        echo "You could remake server certificate with '/usr/local/bin/httpscert new'"
                        exit 1