From 6ef3b258626eb2c936f7f5cb0f57ce9e8100e027 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sat, 23 Apr 2016 10:04:13 +0100
Subject: [PATCH] Tidying

---
 src/freedombone-dhparam | 152 ++++++++++++++++++++--------------------
 1 file changed, 76 insertions(+), 76 deletions(-)

diff --git a/src/freedombone-dhparam b/src/freedombone-dhparam
index 990b5c28..8c39a21b 100755
--- a/src/freedombone-dhparam
+++ b/src/freedombone-dhparam
@@ -131,105 +131,105 @@ aDWQRvTrh5+SQAlDi0gcbNeImgAu1e44K8kZDab8Am5HlVjkR1Z36aqeMFDidlaU
 '
 
 function show_help {
-    echo ''
-    echo $"${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]"
-    echo ''
-    exit 0
+	echo ''
+	echo $"${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]"
+	echo ''
+	exit 0
 }
 
 function calc_dh {
-    if [[ $FAST == 'yes' ]]; then
-        DHGROUP=$(( ( RANDOM % 4 )  + 14 ))
-        if [[ ${DHGROUP} == 14 ]]; then
-            echo "$BETTERCRYPTO_GROUP14" > ${1}
-        else
-            if [[ ${DHGROUP} == 15 ]]; then
-                echo "$BETTERCRYPTO_GROUP15" > ${1}
-            else
-                if [[ ${DHGROUP} == 16 ]]; then
-                    echo "$BETTERCRYPTO_GROUP16" > ${1}
-                else
-                    if [[ ${DHGROUP} == 17 ]]; then
-                        echo "$BETTERCRYPTO_GROUP17" > ${1}
-                    else
-                        
-                        echo "$BETTERCRYPTO_GROUP18" > ${1}
-                    fi          
-                fi          
-            fi
-        fi      
-    else
-        openssl dhparam -check -text $KEYLENGTH -out ${1}
-        if [ ! "$?" = "0" ]; then
-            exit 3674
-        fi
-    fi  
-    chmod 640 ${1}
+	if [[ $FAST == 'yes' ]]; then
+		DHGROUP=$(( ( RANDOM % 4 )  + 14 ))
+		if [[ ${DHGROUP} == 14 ]]; then
+			echo "$BETTERCRYPTO_GROUP14" > ${1}
+		else
+			if [[ ${DHGROUP} == 15 ]]; then
+				echo "$BETTERCRYPTO_GROUP15" > ${1}
+			else
+				if [[ ${DHGROUP} == 16 ]]; then
+					echo "$BETTERCRYPTO_GROUP16" > ${1}
+				else
+					if [[ ${DHGROUP} == 17 ]]; then
+						echo "$BETTERCRYPTO_GROUP17" > ${1}
+					else
+
+						echo "$BETTERCRYPTO_GROUP18" > ${1}
+					fi
+				fi
+			fi
+		fi
+	else
+		openssl dhparam -check -text $KEYLENGTH -out ${1}
+		if [ ! "$?" = "0" ]; then
+			exit 3674
+		fi
+	fi
+	chmod 640 ${1}
 }
 
 function regenerate_dh_keys {
-    for file in /etc/ssl/mycerts/*
-    do
-        if [[ -f $file ]]; then
-            filename=/etc/ssl/certs/$(echo $file | awk -F '/etc/ssl/mycerts/' '{print $2}' | awk -F '.crt' '{print $1}').dhparam
-            if [ -f $filename ]; then
-                calc_dh $filename
-                echo $"Recalculated DH params for $filename"
-            fi
-        fi
-    done
+	for file in /etc/ssl/mycerts/*
+	do
+		if [[ -f $file ]]; then
+			filename=/etc/ssl/certs/$(echo $file | awk -F '/etc/ssl/mycerts/' '{print $2}' | awk -F '.crt' '{print $1}').dhparam
+			if [ -f $filename ]; then
+				calc_dh $filename
+				echo $"Recalculated DH params for $filename"
+			fi
+		fi
+	done
 }
 
 while [[ $# > 1 ]]
 do
-    key="$1"
+	key="$1"
 
-    case $key in
-        --help)
-            show_help
-            ;;
-        -h|--hostname)
-            shift
-            HOSTNAME="$1"
-            ;;
-        -l|--dhkey)
-            shift
-            KEYLENGTH=${1}
-            ;;
-        --recalc)
-            shift
-            RECALCULATE=${1}
-            ;;
-        --fast)
-            shift
-            if [[ ${1} == $"yes" || ${1} == $"y" ]]; then
-                FAST='yes'
-            fi
-            ;;
-        *)
-            # unknown option
-            ;;
-    esac
-    shift
+	case $key in
+		--help)
+			show_help
+			;;
+		-h|--hostname)
+			shift
+			HOSTNAME="$1"
+			;;
+		-l|--dhkey)
+			shift
+			KEYLENGTH=${1}
+			;;
+		--recalc)
+			shift
+			RECALCULATE=${1}
+			;;
+		--fast)
+			shift
+			if [[ ${1} == $"yes" || ${1} == $"y" ]]; then
+				FAST='yes'
+			fi
+			;;
+		*)
+			# unknown option
+			;;
+	esac
+	shift
 done
 
 if [[ $RECALCULATE == "yes" || $RECALCULATE == "y" ]]; then
-    regenerate_dh_keys
-    exit 0
+	regenerate_dh_keys
+	exit 0
 fi
 
 if [ ! $HOSTNAME ]; then
-    echo $'No hostname specified'
-    exit 5728
+	echo $'No hostname specified'
+	exit 5728
 fi
 
 if ! which openssl > /dev/null ;then
-    echo $"$0: openssl is not installed, exiting" 1>&2
-    exit 5689
+	echo $"$0: openssl is not installed, exiting" 1>&2
+	exit 5689
 fi
 
 if [ ! -d /etc/ssl/mycerts ]; then
-    mkdir -p /etc/ssl/mycerts
+	mkdir -p /etc/ssl/mycerts
 fi
 
 calc_dh /etc/ssl/certs/$HOSTNAME.dhparam