Bob Mottram 10 years ago
parent
commit
0409796f10
1 changed files with 5 additions and 1 deletions
  1. 5
    1
      src/freedombone-sec

+ 5
- 1
src/freedombone-sec View File

337
 function regenerate_dh_keys {
337
 function regenerate_dh_keys {
338
   if [[ $REGENERATE_DH_KEYS == "yes" ]]; then
338
   if [[ $REGENERATE_DH_KEYS == "yes" ]]; then
339
       if [ ! -d /etc/ssl/mycerts ]; then
339
       if [ ! -d /etc/ssl/mycerts ]; then
340
+          echo 'No dhparam certificates were found'
340
           return
341
           return
341
       fi
342
       fi
342
 
343
 
343
       data=$(tempfile 2>/dev/null)
344
       data=$(tempfile 2>/dev/null)
344
       trap "rm -f $data" 0 1 2 5 15
345
       trap "rm -f $data" 0 1 2 5 15
345
       dialog --backtitle "Freedombone Security Configuration" \
346
       dialog --backtitle "Freedombone Security Configuration" \
346
-             --radiolist "Select a key length:" 10 40 2 \
347
+             --radiolist "Select a Diffie-Hellman key length. The smaller length is better suited to low power systems:" 12 40 2 \
347
              1 "1024 bits" off \
348
              1 "1024 bits" off \
348
              2 "3072 bits" on 2> $data
349
              2 "3072 bits" on 2> $data
349
       sel=$?
350
       sel=$?
356
           2) DH_KEYLENGTH=3072;;
357
           2) DH_KEYLENGTH=3072;;
357
       esac
358
       esac
358
 
359
 
360
+      ctr=0
359
       for file in /etc/ssl/mycerts/*
361
       for file in /etc/ssl/mycerts/*
360
       do
362
       do
361
           if [[ -f $file ]]; then
363
           if [[ -f $file ]]; then
362
               filename=/etc/ssl/certs/$(echo $file | awk -F '/etc/ssl/mycerts/' '{print $2}' | awk -F '.crt' '{print $1}').dhparam
364
               filename=/etc/ssl/certs/$(echo $file | awk -F '/etc/ssl/mycerts/' '{print $2}' | awk -F '.crt' '{print $1}').dhparam
363
               if [ -f $filename ]; then
365
               if [ -f $filename ]; then
364
                   openssl dhparam -check -text -5 $DH_KEYLENGTH -out $filename
366
                   openssl dhparam -check -text -5 $DH_KEYLENGTH -out $filename
367
+                  ctr=$((ctr + 1))
365
               fi
368
               fi
366
           fi
369
           fi
367
       done
370
       done
371
+      echo "$ctr dhparam certificates were regenerated"
368
   fi
372
   fi
369
 }
373
 }
370
 
374