소스 검색

Obtaining ssl and ssh parameters

Bob Mottram 8 년 전
부모
커밋
4c5ea23ed6
1개의 변경된 파일7개의 추가작업 그리고 5개의 파일을 삭제
  1. 7
    5
      src/freedombone-sec

+ 7
- 5
src/freedombone-sec 파일 보기

@@ -528,8 +528,10 @@ function update_ciphersuite {
528 528
     if [ ! -f $project_filename ]; then
529 529
         project_filename=/usr/bin/${PROJECT_NAME}
530 530
     fi
531
+    SSH_FILENAME=${project_filename}-utils-ssh
532
+    SSL_FILENAME=${project_filename}-utils-web
531 533
 
532
-    RECOMMENDED_SSL_CIPHERS=$(cat $project_filename | grep 'SSL_CIPHERS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
534
+    RECOMMENDED_SSL_CIPHERS=$(cat $SSL_FILENAME | grep 'SSL_CIPHERS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
533 535
     if [ ! "$RECOMMENDED_SSL_CIPHERS" ]; then
534 536
         return
535 537
     fi
@@ -537,7 +539,7 @@ function update_ciphersuite {
537 539
         return
538 540
     fi
539 541
 
540
-    RECOMMENDED_SSL_PROTOCOLS=$(cat $project_filename | grep 'SSL_PROTOCOLS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
542
+    RECOMMENDED_SSL_PROTOCOLS=$(cat $SSL_FILENAME | grep 'SSL_PROTOCOLS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
541 543
     if [ ! "$RECOMMENDED_SSL_PROTOCOLS" ]; then
542 544
         return
543 545
     fi
@@ -545,7 +547,7 @@ function update_ciphersuite {
545 547
         return
546 548
     fi
547 549
 
548
-    RECOMMENDED_SSH_CIPHERS=$(cat $project_filename | grep 'SSH_CIPHERS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
550
+    RECOMMENDED_SSH_CIPHERS=$(cat $SSH_FILENAME | grep 'SSH_CIPHERS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
549 551
     if [ ! "$RECOMMENDED_SSH_CIPHERS" ]; then
550 552
         return
551 553
     fi
@@ -553,7 +555,7 @@ function update_ciphersuite {
553 555
         return
554 556
     fi
555 557
 
556
-    RECOMMENDED_SSH_MACS=$(cat $project_filename | grep 'SSH_MACS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
558
+    RECOMMENDED_SSH_MACS=$(cat $SSH_FILENAME | grep 'SSH_MACS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
557 559
     if [ ! "$RECOMMENDED_SSH_MACS" ]; then
558 560
         return
559 561
     fi
@@ -561,7 +563,7 @@ function update_ciphersuite {
561 563
         return
562 564
     fi
563 565
 
564
-    RECOMMENDED_SSH_KEX=$(cat $project_filename | grep 'SSH_KEX=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
566
+    RECOMMENDED_SSH_KEX=$(cat $SSH_FILENAME | grep 'SSH_KEX=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}')
565 567
     if [ ! "$RECOMMENDED_SSH_KEX" ]; then
566 568
         return
567 569
     fi