From 265e0615a398affd6166e0e1bd9be7f6b2f3cd50 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 28 Sep 2026 09:01:24 +0800 Subject: vim-patch:699a620: runtime(sshconfig): Add deprecated syntax highlighting Added deprecated keywords for ciphers, MACs, and host key algorithms in sshconfig syntax highlighting. related: vim/vim#21376 https://github.com/vim/vim/commit/699a620722a7039323bde996782567518fcdbc7e Co-authored-by: Rochish Manda <28740792+Rochish-Manda@users.noreply.github.com> --- runtime/syntax/sshconfig.vim | 51 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 25 deletions(-) (limited to 'runtime/syntax/sshconfig.vim') diff --git a/runtime/syntax/sshconfig.vim b/runtime/syntax/sshconfig.vim index a4bdb5265b..9572bcdfee 100644 --- a/runtime/syntax/sshconfig.vim +++ b/runtime/syntax/sshconfig.vim @@ -9,6 +9,7 @@ " Last Change: 2026 Mar 31 " SSH Version: 10.1p1 " 2026 Sep 19 by Vim project: Add UseKeychain keyword #21339 +" 2026 Sep 27 by Vim project: update secure keywords #21376 " " Setup @@ -39,15 +40,11 @@ syn keyword sshconfigYesNo force autoask none syn keyword sshconfigCipher 3des blowfish syn keyword sshconfigCiphers 3des-cbc -syn keyword sshconfigCiphers blowfish-cbc -syn keyword sshconfigCiphers cast128-cbc -syn keyword sshconfigCiphers arcfour -syn keyword sshconfigCiphers arcfour128 -syn keyword sshconfigCiphers arcfour256 +syn keyword sshconfigCiphersDeprecated blowfish-cbc cast128-cbc arcfour arcfour128 arcfour256 syn keyword sshconfigCiphers aes128-cbc syn keyword sshconfigCiphers aes192-cbc syn keyword sshconfigCiphers aes256-cbc -syn match sshconfigCiphers "\" +syn match sshconfigCiphersDeprecated "\" syn keyword sshconfigCiphers aes128-ctr syn keyword sshconfigCiphers aes192-ctr syn keyword sshconfigCiphers aes256-ctr @@ -61,7 +58,7 @@ syn keyword sshconfigMAC hmac-sha2-256 syn keyword sshconfigMAC hmac-sha2-512 syn keyword sshconfigMAC hmac-md5 syn keyword sshconfigMAC hmac-md5-96 -syn match sshconfigMAC "\" +syn match sshconfigMACDeprecated "\" syn match sshconfigMAC "\" syn match sshconfigMAC "\" syn match sshconfigMAC "\" @@ -70,30 +67,32 @@ syn match sshconfigMAC "\" syn match sshconfigMAC "\" syn match sshconfigMAC "\" syn match sshconfigMAC "\" -syn match sshconfigMAC "\" +syn match sshconfigMACDeprecated "\" syn match sshconfigMAC "\" syn match sshconfigMAC "\" +syn keyword sshconfigHostKeyAlgo ssh-mldsa44-ed25519 +syn keyword sshconfigHostKeyAlgo ssh-mldsa44-ed25519-cert syn keyword sshconfigHostKeyAlgo ssh-ed25519 -syn match sshconfigHostKeyAlgo "\" -syn match sshconfigHostKeyAlgo "\" -syn match sshconfigHostKeyAlgo "\" +syn match sshconfigHostKeyAlgo "\" +syn match sshconfigHostKeyAlgo "\" +syn match sshconfigHostKeyAlgo "\" syn keyword sshconfigHostKeyAlgo ssh-rsa syn keyword sshconfigHostKeyAlgo rsa-sha2-256 syn keyword sshconfigHostKeyAlgo rsa-sha2-512 -syn keyword sshconfigHostKeyAlgo ssh-dss +syn keyword sshconfigHostKeyAlgoDeprecated ssh-dss syn keyword sshconfigHostKeyAlgo ecdsa-sha2-nistp256 syn keyword sshconfigHostKeyAlgo ecdsa-sha2-nistp384 syn keyword sshconfigHostKeyAlgo ecdsa-sha2-nistp521 -syn match sshconfigHostKeyAlgo "\" -syn match sshconfigHostKeyAlgo "\" -syn match sshconfigHostKeyAlgo "\" -syn match sshconfigHostKeyAlgo "\" -syn match sshconfigHostKeyAlgo "\" -syn match sshconfigHostKeyAlgo "\" -syn match sshconfigHostKeyAlgo "\" -syn match sshconfigHostKeyAlgo "\" -syn match sshconfigHostKeyAlgo "\" +syn match sshconfigHostKeyAlgo "\<\%(webauthn-\)\?sk-ecdsa-sha2-nistp256@openssh\.com\>" +syn match sshconfigHostKeyAlgo "\" +syn match sshconfigHostKeyAlgo "\" +syn match sshconfigHostKeyAlgo "\" +syn match sshconfigHostKeyAlgoDeprecated "\" +syn match sshconfigHostKeyAlgo "\" +syn match sshconfigHostKeyAlgo "\" +syn match sshconfigHostKeyAlgo "\" +syn match sshconfigHostKeyAlgo "\<\%(webauthn-\)\?sk-ecdsa-sha2-nistp256-cert-v01@openssh\.com\>" syn keyword sshconfigPreferredAuth hostbased publickey password gssapi-with-mic syn keyword sshconfigPreferredAuth keyboard-interactive @@ -120,9 +119,8 @@ syn keyword sshconfigKexAlgo diffie-hellman-group14-sha256 syn keyword sshconfigKexAlgo ecdh-sha2-nistp256 syn keyword sshconfigKexAlgo ecdh-sha2-nistp384 syn keyword sshconfigKexAlgo ecdh-sha2-nistp521 -syn match sshconfigKexAlgo "\" -syn match sshconfigKexAlgo "\" -syn keyword sshconfigKexAlgo sntrup761x25519-sha512 +syn match sshconfigKexAlgo "\" +syn match sshconfigKexAlgo "\" syn keyword sshconfigKexAlgo mlkem768x25519-sha256 syn keyword sshconfigTunnel point-to-point ethernet @@ -158,7 +156,6 @@ syn keyword sshconfigKeyword CanonicalizeMaxDots syn keyword sshconfigKeyword CanonicalizePermittedCNAMEs syn keyword sshconfigKeyword CASignatureAlgorithms syn keyword sshconfigKeyword CertificateFile -syn keyword sshconfigKeyword ChallengeResponseAuthentication syn keyword sshconfigKeyword ChannelTimeout syn keyword sshconfigKeyword CheckHostIP syn keyword sshconfigKeyword Ciphers @@ -258,6 +255,7 @@ syn keyword sshconfigKeyword XAuthLocation " Deprecated/ignored/remove/unsupported keywords +syn keyword sshConfigDeprecated ChallengeResponseAuthentication syn keyword sshConfigDeprecated Cipher syn keyword sshconfigDeprecated GSSAPIClientIdentity syn keyword sshconfigDeprecated GSSAPIKeyExchange @@ -282,8 +280,11 @@ hi def link sshconfigConstant Constant hi def link sshconfigYesNo Boolean hi def link sshconfigCipher sshconfigDeprecated hi def link sshconfigCiphers sshconfigEnum +hi def link sshconfigCiphersDeprecated sshconfigDeprecated hi def link sshconfigMAC sshconfigEnum +hi def link sshconfigMACDeprecated sshconfigDeprecated hi def link sshconfigHostKeyAlgo sshconfigEnum +hi def link sshconfigHostKeyAlgoDeprecated sshconfigDeprecated hi def link sshconfigLogLevel sshconfigEnum hi def link sshconfigSysLogFacility sshconfigEnum hi def link sshconfigAddressFamily sshconfigEnum -- cgit