From 4c5ea23ed6113d3a08732fdc600335e5a6049665 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Wed, 21 Sep 2016 22:42:24 +0100
Subject: [PATCH] Obtaining ssl and ssh parameters

---
 src/freedombone-sec | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/freedombone-sec b/src/freedombone-sec
index 65799737..a46bb89f 100755
--- a/src/freedombone-sec
+++ b/src/freedombone-sec
@@ -528,8 +528,10 @@ function update_ciphersuite {
     if [ ! -f $project_filename ]; then
         project_filename=/usr/bin/${PROJECT_NAME}
     fi
+    SSH_FILENAME=${project_filename}-utils-ssh
+    SSL_FILENAME=${project_filename}-utils-web
 
-    RECOMMENDED_SSL_CIPHERS=$(cat $project_filename | grep 'SSL_CIPHERS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
+    RECOMMENDED_SSL_CIPHERS=$(cat $SSL_FILENAME | grep 'SSL_CIPHERS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
     if [ ! "$RECOMMENDED_SSL_CIPHERS" ]; then
         return
     fi
@@ -537,7 +539,7 @@ function update_ciphersuite {
         return
     fi
 
-    RECOMMENDED_SSL_PROTOCOLS=$(cat $project_filename | grep 'SSL_PROTOCOLS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
+    RECOMMENDED_SSL_PROTOCOLS=$(cat $SSL_FILENAME | grep 'SSL_PROTOCOLS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
     if [ ! "$RECOMMENDED_SSL_PROTOCOLS" ]; then
         return
     fi
@@ -545,7 +547,7 @@ function update_ciphersuite {
         return
     fi
 
-    RECOMMENDED_SSH_CIPHERS=$(cat $project_filename | grep 'SSH_CIPHERS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
+    RECOMMENDED_SSH_CIPHERS=$(cat $SSH_FILENAME | grep 'SSH_CIPHERS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
     if [ ! "$RECOMMENDED_SSH_CIPHERS" ]; then
         return
     fi
@@ -553,7 +555,7 @@ function update_ciphersuite {
         return
     fi
 
-    RECOMMENDED_SSH_MACS=$(cat $project_filename | grep 'SSH_MACS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
+    RECOMMENDED_SSH_MACS=$(cat $SSH_FILENAME | grep 'SSH_MACS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
     if [ ! "$RECOMMENDED_SSH_MACS" ]; then
         return
     fi
@@ -561,7 +563,7 @@ function update_ciphersuite {
         return
     fi
 
-    RECOMMENDED_SSH_KEX=$(cat $project_filename | grep 'SSH_KEX=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
+    RECOMMENDED_SSH_KEX=$(cat $SSH_FILENAME | grep 'SSH_KEX=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
     if [ ! "$RECOMMENDED_SSH_KEX" ]; then
         return
     fi