X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fremote.cgi;h=ed8a94d246877251648acbaa63a85ee0069e9790;hp=4d6eb19cca709db0ce7a1abe58983243470696de;hb=abcbbd1fd7d11549b7c44e301f17a4b9596a04b5;hpb=82bca50c9c5fd587ac1ee033ad9e86335502ad94

diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi
index 4d6eb19cca..ed8a94d246 100644
--- a/html/cgi-bin/remote.cgi
+++ b/html/cgi-bin/remote.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -37,7 +37,6 @@ my $counter = 0;
 &Header::showhttpheaders();
 
 $remotesettings{'ENABLE_SSH'} = 'off';
-$remotesettings{'ENABLE_SSH_PORTOCOL1'} = 'off';
 $remotesettings{'ENABLE_SSH_PORTFW'} = 'off';
 $remotesettings{'ACTION'} = '';
 &Header::getcgihash(\%remotesettings);
@@ -65,15 +64,6 @@ if ( (($remotesettings{'ACTION'} eq $Lang::tr{'save'}) || ($remotesettings{'ACTI
 		&General::log($Lang::tr{'ssh is disabled'});
 		unlink "${General::swroot}/remote/enablessh";
 	}
-
-	if ($remotesettings{'ENABLE_SSH_PORTOCOL1'} eq 'on')
-	{
-		&General::log($Lang::tr{'ssh1 enabled'});
-	}
-	else
-	{
-		&General::log($Lang::tr{'ssh1 disabled'});
-	}
 	
 	if ($remotesettings{'SSH_PORT'} eq 'on')
 	{
@@ -111,9 +101,6 @@ else {
 $checked{'ENABLE_SSH'}{'off'} = '';
 $checked{'ENABLE_SSH'}{'on'} = '';
 $checked{'ENABLE_SSH'}{$remotesettings{'ENABLE_SSH'}} = "checked='checked'";
-$checked{'ENABLE_SSH_PORTOCOL1'}{'off'} = '';
-$checked{'ENABLE_SSH_PORTOCOL1'}{'on'} = '';
-$checked{'ENABLE_SSH_PORTOCOL1'}{$remotesettings{'ENABLE_SSH_PORTOCOL1'}} = "checked='checked'";
 $checked{'ENABLE_SSH_PORTFW'}{'off'} = '';
 $checked{'ENABLE_SSH_PORTFW'}{'on'} = '';
 $checked{'ENABLE_SSH_PORTFW'}{$remotesettings{'ENABLE_SSH_PORTFW'}} = "checked='checked'";
@@ -146,11 +133,6 @@ print <<END
 	<td><input type='checkbox' name='ENABLE_SSH' $checked{'ENABLE_SSH'}{'on'} /></td>
 	<td class='base' colspan='2'>$Lang::tr{'ssh access'}</td>
 </tr>
-<tr>
-	<td>&nbsp;</td>
-	<td><input type='checkbox' name='ENABLE_SSH_PORTOCOL1' $checked{'ENABLE_SSH_PORTOCOL1'}{'on'} /></td>
-	<td width='100%' class='base'>$Lang::tr{'ssh1 support'}</td>
-</tr>
 <tr>
 	<td>&nbsp;</td>
 	<td><input type='checkbox' name='ENABLE_SSH_PORTFW' $checked{'ENABLE_SSH_PORTFW'}{'on'} /></td>
@@ -198,6 +180,7 @@ END
 &viewkey("/etc/ssh/ssh_host_key.pub","RSA1");
 &viewkey("/etc/ssh/ssh_host_rsa_key.pub","RSA2");
 &viewkey("/etc/ssh/ssh_host_dsa_key.pub","DSA");
+&viewkey("/etc/ssh/ssh_host_ecdsa_key.pub","ECDSA");
 
 print "</table>\n";