Moving SSH-1-only option to less prominent positions on Advanced Site Settings dialog and removing SSH-2-only designations of session options

Source commit: 550bf4b463ea6172229a36d4aaeca4d04888c714

source/forms/SiteAdvanced.dfm

@@ -1961,7 +1961,7 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
           Width = 382
           Height = 17
           Anchors = [akLeft, akTop, akRight]
-          Caption = '&Bypass authentication entirely (SSH-2)'
+          Caption = '&Bypass authentication entirely'
           TabOrder = 0
           OnClick = DataChange
         end
@@ -1988,32 +1988,32 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
           end
           object AuthTISCheck: TCheckBox
             Left = 12
-            Top = 42
+            Top = 88
             Width = 373
             Height = 17
             Anchors = [akLeft, akTop, akRight]
             Caption = 'Atte&mpt TIS or CryptoCard authentication (SSH-1)'
-            TabOrder = 1
+            TabOrder = 3
             OnClick = DataChange
           end
           object AuthKICheck: TCheckBox
             Left = 12
-            Top = 65
+            Top = 42
             Width = 373
             Height = 17
             Anchors = [akLeft, akTop, akRight]
-            Caption = 'Attempt '#39'keyboard-&interactive'#39' authentication (SSH-2)'
-            TabOrder = 2
+            Caption = 'Attempt '#39'keyboard-&interactive'#39' authentication'
+            TabOrder = 1
             OnClick = DataChange
           end
           object AuthKIPasswordCheck: TCheckBox
             Left = 32
-            Top = 88
+            Top = 65
             Width = 353
             Height = 17
             Anchors = [akLeft, akTop, akRight]
             Caption = 'Respond with pass&word to the first prompt'
-            TabOrder = 3
+            TabOrder = 2
             OnClick = DataChange
           end
         end
@@ -2084,7 +2084,7 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
             Width = 373
             Height = 17
             Anchors = [akLeft, akTop, akRight]
-            Caption = 'Attempt &GSSAPI authentication (SSH-2)'
+            Caption = 'Attempt &GSSAPI authentication'
             TabOrder = 0
             OnClick = AuthGSSAPICheck3Click
           end
@@ -2123,7 +2123,7 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
             289)
           object BugIgnore1Label: TLabel
             Left = 12
-            Top = 20
+            Top = 212
             Width = 169
             Height = 13
             Caption = 'Chokes on SSH-1 &ignore messages:'
@@ -2131,7 +2131,7 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
           end
           object BugPlainPW1Label: TLabel
             Left = 12
-            Top = 44
+            Top = 236
             Width = 195
             Height = 13
             Caption = 'Refuses all SSH-1 pass&word camouflage:'
@@ -2139,7 +2139,7 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
           end
           object BugRSA1Label: TLabel
             Left = 12
-            Top = 68
+            Top = 260
             Width = 181
             Height = 13
             Caption = 'Chokes on SSH-1 &RSA authentication:'
@@ -2147,7 +2147,7 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
           end
           object BugHMAC2Label: TLabel
             Left = 12
-            Top = 140
+            Top = 68
             Width = 154
             Height = 13
             Caption = 'Miscomputes SSH-2 H&MAC keys:'
@@ -2155,7 +2155,7 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
           end
           object BugDeriveKey2Label: TLabel
             Left = 12
-            Top = 164
+            Top = 92
             Width = 176
             Height = 13
             Caption = 'Miscomputes SSH-2 &encryption keys:'
@@ -2163,7 +2163,7 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
           end
           object BugRSAPad2Label: TLabel
             Left = 12
-            Top = 188
+            Top = 116
             Width = 210
             Height = 13
             Caption = 'Requires &padding on SSH-2 RSA signatures:'
@@ -2171,7 +2171,7 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
           end
           object BugPKSessID2Label: TLabel
             Left = 12
-            Top = 212
+            Top = 140
             Width = 195
             Height = 13
             Caption = 'Misuses the sessio&n ID in SSH-2 PK auth:'
@@ -2179,7 +2179,7 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
           end
           object BugRekey2Label: TLabel
             Left = 12
-            Top = 236
+            Top = 164
             Width = 187
             Height = 13
             Caption = 'Handles SSH-2 &key re-exchange badly:'
@@ -2187,7 +2187,7 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
           end
           object BugMaxPkt2Label: TLabel
             Left = 12
-            Top = 260
+            Top = 188
             Width = 176
             Height = 13
             Caption = 'Ignores SSH-2 ma&ximum packet size:'
@@ -2195,7 +2195,7 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
           end
           object BugIgnore2Label: TLabel
             Left = 12
-            Top = 92
+            Top = 20
             Width = 169
             Height = 13
             Caption = 'Chokes on SSH-&2 ignore messages:'
@@ -2203,7 +2203,7 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
           end
           object BugWinAdjLabel: TLabel
             Left = 12
-            Top = 116
+            Top = 44
             Width = 212
             Height = 13
             Caption = 'Chokes on WinSCP'#39's SSH-2 '#39'winadj'#39' requests'
@@ -2211,112 +2211,112 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
           end
           object BugIgnore1Combo: TComboBox
             Left = 320
-            Top = 15
+            Top = 207
             Width = 61
             Height = 21
             Style = csDropDownList
             Anchors = [akTop, akRight]
-            TabOrder = 0
+            TabOrder = 8
             OnChange = DataChange
           end
           object BugPlainPW1Combo: TComboBox
             Left = 320
-            Top = 39
+            Top = 231
             Width = 61
             Height = 21
             Style = csDropDownList
             Anchors = [akTop, akRight]
-            TabOrder = 1
+            TabOrder = 9
             OnChange = DataChange
           end
           object BugRSA1Combo: TComboBox
             Left = 320
-            Top = 63
+            Top = 255
             Width = 61
             Height = 21
             Style = csDropDownList
             Anchors = [akTop, akRight]
-            TabOrder = 2
+            TabOrder = 10
             OnChange = DataChange
           end
           object BugHMAC2Combo: TComboBox
             Left = 320
-            Top = 135
+            Top = 63
             Width = 61
             Height = 21
             Style = csDropDownList
             Anchors = [akTop, akRight]
-            TabOrder = 5
+            TabOrder = 2
             OnChange = DataChange
           end
           object BugDeriveKey2Combo: TComboBox
             Left = 320
-            Top = 159
+            Top = 87
             Width = 61
             Height = 21
             Style = csDropDownList
             Anchors = [akTop, akRight]
-            TabOrder = 6
+            TabOrder = 3
             OnChange = DataChange
           end
           object BugRSAPad2Combo: TComboBox
             Left = 320
-            Top = 183
+            Top = 111
             Width = 61
             Height = 21
             Style = csDropDownList
             Anchors = [akTop, akRight]
-            TabOrder = 7
+            TabOrder = 4
             OnChange = DataChange
           end
           object BugPKSessID2Combo: TComboBox
             Left = 320
-            Top = 207
+            Top = 135
             Width = 61
             Height = 21
             Style = csDropDownList
             Anchors = [akTop, akRight]
-            TabOrder = 8
+            TabOrder = 5
             OnChange = DataChange
           end
           object BugRekey2Combo: TComboBox
             Left = 320
-            Top = 231
+            Top = 159
             Width = 61
             Height = 21
             Style = csDropDownList
             Anchors = [akTop, akRight]
-            TabOrder = 9
+            TabOrder = 6
             OnChange = DataChange
           end
           object BugMaxPkt2Combo: TComboBox
             Left = 320
-            Top = 255
+            Top = 183
             Width = 61
             Height = 21
             Style = csDropDownList
             Anchors = [akTop, akRight]
-            TabOrder = 10
+            TabOrder = 7
             OnChange = DataChange
           end
           object BugIgnore2Combo: TComboBox
             Left = 320
-            Top = 87
+            Top = 15
             Width = 61
             Height = 21
             Style = csDropDownList
             Anchors = [akTop, akRight]
-            TabOrder = 3
+            TabOrder = 0
             OnChange = DataChange
           end
           object BugWinAdjCombo: TComboBox
             Left = 320
-            Top = 111
+            Top = 39
             Width = 61
             Height = 21
             Style = csDropDownList
             Anchors = [akTop, akRight]
-            TabOrder = 4
+            TabOrder = 1
             OnChange = DataChange
           end
         end

source/resource/TextsWin1.rc

@@ -428,10 +428,10 @@ BEGIN
         CIPHER_NAME_WARN, "-- warn below here --"
         CIPHER_NAME_3DES, "3DES"
         CIPHER_NAME_BLOWFISH, "Blowfish"
-        CIPHER_NAME_AES, "AES (SSH-2 only)"
+        CIPHER_NAME_AES, "AES"
         CIPHER_NAME_DES, "DES"
-        CIPHER_NAME_ARCFOUR, "Arcfour (SSH-2 only)"
-        CIPHER_NAME_CHACHA20, "ChaCha20 (SSH-2 only)"
+        CIPHER_NAME_ARCFOUR, "Arcfour"
+        CIPHER_NAME_CHACHA20, "ChaCha20"
         KEX_NAME_WARN, "-- warn below here --"
         KEX_NAME_DHGROUP1, "Diffie-Hellman group 1"
         KEX_NAME_DHGROUP14, "Diffie-Hellman group 14"