| 
				
			 | 
			
			
				@@ -52,7 +52,6 @@ CURRENT_DIR=$(pwd) 
			 | 
		
	
		
			
			| 
				52
			 | 
			
				52
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				53
			 | 
			
				53
			 | 
			
			
				 REGENERATE_SSH_HOST_KEYS="no" 
			 | 
		
	
		
			
			| 
				54
			 | 
			
				54
			 | 
			
			
				 REGENERATE_DH_KEYS="no" 
			 | 
		
	
		
			
			| 
				55
			 | 
			
				
			 | 
			
			
				-RESET_TRIPWIRE="no" 
			 | 
		
	
		
			
			| 
				56
			 | 
			
				55
			 | 
			
			
				 DH_KEYLENGTH=2048 
			 | 
		
	
		
			
			| 
				57
			 | 
			
				56
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				58
			 | 
			
				57
			 | 
			
			
				 function get_protocols_from_website { 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -376,25 +375,13 @@ function regenerate_dh_keys { 
			 | 
		
	
		
			
			| 
				376
			 | 
			
				375
			 | 
			
			
				   fi 
			 | 
		
	
		
			
			| 
				377
			 | 
			
				376
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				378
			 | 
			
				377
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				379
			 | 
			
				
			 | 
			
			
				-function reset_tripwire { 
			 | 
		
	
		
			
			| 
				380
			 | 
			
				
			 | 
			
			
				-  if [[ $RESET_TRIPWIRE != "yes" ]]; then 
			 | 
		
	
		
			
			| 
				381
			 | 
			
				
			 | 
			
			
				-      return 
			 | 
		
	
		
			
			| 
				382
			 | 
			
				
			 | 
			
			
				-  fi 
			 | 
		
	
		
			
			| 
				383
			 | 
			
				
			 | 
			
			
				-  clear 
			 | 
		
	
		
			
			| 
				384
			 | 
			
				
			 | 
			
			
				-  echo ' 
			 | 
		
	
		
			
			| 
				385
			 | 
			
				
			 | 
			
			
				- 
			 | 
		
	
		
			
			| 
				386
			 | 
			
				
			 | 
			
			
				-' | reset-tripwire 
			 | 
		
	
		
			
			| 
				387
			 | 
			
				
			 | 
			
			
				-  exit 0 
			 | 
		
	
		
			
			| 
				388
			 | 
			
				
			 | 
			
			
				-} 
			 | 
		
	
		
			
			| 
				389
			 | 
			
				
			 | 
			
			
				- 
			 | 
		
	
		
			
			| 
				390
			 | 
			
				378
			 | 
			
			
				 function housekeeping { 
			 | 
		
	
		
			
			| 
				391
			 | 
			
				379
			 | 
			
			
				   cmd=(dialog --separate-output \ 
			 | 
		
	
		
			
			| 
				392
			 | 
			
				380
			 | 
			
			
				               --backtitle "Freedombone Security Configuration" \ 
			 | 
		
	
		
			
			| 
				393
			 | 
			
				381
			 | 
			
			
				               --title "Housekeeping options" \ 
			 | 
		
	
		
			
			| 
				394
			 | 
			
				382
			 | 
			
			
				               --checklist "If you don't need to do any of these things then just press Enter:" 10 76 16) 
			 | 
		
	
		
			
			| 
				395
			 | 
			
				383
			 | 
			
			
				   options=(1 "Regenerate ssh host keys" off 
			 | 
		
	
		
			
			| 
				396
			 | 
			
				
			 | 
			
			
				-           2 "Regenerate Diffie-Hellman keys" off 
			 | 
		
	
		
			
			| 
				397
			 | 
			
				
			 | 
			
			
				-           3 "Reset tripwire" off) 
			 | 
		
	
		
			
			| 
				
			 | 
			
				384
			 | 
			
			
				+           2 "Regenerate Diffie-Hellman keys" off) 
			 | 
		
	
		
			
			| 
				398
			 | 
			
				385
			 | 
			
			
				   choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty) 
			 | 
		
	
		
			
			| 
				399
			 | 
			
				386
			 | 
			
			
				   clear 
			 | 
		
	
		
			
			| 
				400
			 | 
			
				387
			 | 
			
			
				   for choice in $choices 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -406,12 +393,8 @@ function housekeeping { 
			 | 
		
	
		
			
			| 
				406
			 | 
			
				393
			 | 
			
			
				       2) 
			 | 
		
	
		
			
			| 
				407
			 | 
			
				394
			 | 
			
			
				         REGENERATE_DH_KEYS="yes" 
			 | 
		
	
		
			
			| 
				408
			 | 
			
				395
			 | 
			
			
				         ;; 
			 | 
		
	
		
			
			| 
				409
			 | 
			
				
			 | 
			
			
				-      3) 
			 | 
		
	
		
			
			| 
				410
			 | 
			
				
			 | 
			
			
				-        RESET_TRIPWIRE="yes" 
			 | 
		
	
		
			
			| 
				411
			 | 
			
				
			 | 
			
			
				-        ;; 
			 | 
		
	
		
			
			| 
				412
			 | 
			
				396
			 | 
			
			
				     esac 
			 | 
		
	
		
			
			| 
				413
			 | 
			
				397
			 | 
			
			
				   done 
			 | 
		
	
		
			
			| 
				414
			 | 
			
				
			 | 
			
			
				-  reset_tripwire 
			 | 
		
	
		
			
			| 
				415
			 | 
			
				398
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				416
			 | 
			
				399
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				417
			 | 
			
				400
			 | 
			
			
				 function import_settings { 
			 |