Merge pull request #101222 from omasanori/ssh-kex

nixos/sshd: update kexAlgorithms, fix links

authored by Maximilian Bosch and committed by GitHub 98170761 d4ed4051

+4 -3
+4 -3
nixos/modules/services/networking/ssh/sshd.nix
··· 269 kexAlgorithms = mkOption { 270 type = types.listOf types.str; 271 default = [ 272 "curve25519-sha256@libssh.org" 273 "diffie-hellman-group-exchange-sha256" 274 ]; ··· 279 Defaults to recommended settings from both 280 <link xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html" /> 281 and 282 - <link xlink:href="https://wiki.mozilla.org/Security/Guidelines/OpenSSH#Modern_.28OpenSSH_6.7.2B.29" /> 283 ''; 284 }; 285 ··· 300 Defaults to recommended settings from both 301 <link xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html" /> 302 and 303 - <link xlink:href="https://wiki.mozilla.org/Security/Guidelines/OpenSSH#Modern_.28OpenSSH_6.7.2B.29" /> 304 ''; 305 }; 306 ··· 321 Defaults to recommended settings from both 322 <link xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html" /> 323 and 324 - <link xlink:href="https://wiki.mozilla.org/Security/Guidelines/OpenSSH#Modern_.28OpenSSH_6.7.2B.29" /> 325 ''; 326 }; 327
··· 269 kexAlgorithms = mkOption { 270 type = types.listOf types.str; 271 default = [ 272 + "curve25519-sha256" 273 "curve25519-sha256@libssh.org" 274 "diffie-hellman-group-exchange-sha256" 275 ]; ··· 280 Defaults to recommended settings from both 281 <link xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html" /> 282 and 283 + <link xlink:href="https://infosec.mozilla.org/guidelines/openssh#modern-openssh-67" /> 284 ''; 285 }; 286 ··· 301 Defaults to recommended settings from both 302 <link xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html" /> 303 and 304 + <link xlink:href="https://infosec.mozilla.org/guidelines/openssh#modern-openssh-67" /> 305 ''; 306 }; 307 ··· 322 Defaults to recommended settings from both 323 <link xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html" /> 324 and 325 + <link xlink:href="https://infosec.mozilla.org/guidelines/openssh#modern-openssh-67" /> 326 ''; 327 }; 328