[BACK]Return to myproposal.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/myproposal.h between version 1.62 and 1.63

version 1.62, 2019/12/10 22:43:19 version 1.63, 2019/12/15 18:57:30
Line 41 
Line 41 
 #define KEX_CLIENT_KEX KEX_SERVER_KEX  #define KEX_CLIENT_KEX KEX_SERVER_KEX
   
 #define KEX_DEFAULT_PK_ALG      \  #define KEX_DEFAULT_PK_ALG      \
           "sk-ecdsa-sha2-nistp256-cert-v01@openssh.com," \
           "sk-ssh-ed25519-cert-v01@openssh.com," \
         "ecdsa-sha2-nistp256-cert-v01@openssh.com," \          "ecdsa-sha2-nistp256-cert-v01@openssh.com," \
         "ecdsa-sha2-nistp384-cert-v01@openssh.com," \          "ecdsa-sha2-nistp384-cert-v01@openssh.com," \
         "ecdsa-sha2-nistp521-cert-v01@openssh.com," \          "ecdsa-sha2-nistp521-cert-v01@openssh.com," \
Line 48 
Line 50 
         "rsa-sha2-512-cert-v01@openssh.com," \          "rsa-sha2-512-cert-v01@openssh.com," \
         "rsa-sha2-256-cert-v01@openssh.com," \          "rsa-sha2-256-cert-v01@openssh.com," \
         "ssh-rsa-cert-v01@openssh.com," \          "ssh-rsa-cert-v01@openssh.com," \
           "sk-ecdsa-sha2-nistp256@openssh.com," \
           "sk-ssh-ed25519@openssh.com," \
         "ecdsa-sha2-nistp256," \          "ecdsa-sha2-nistp256," \
         "ecdsa-sha2-nistp384," \          "ecdsa-sha2-nistp384," \
         "ecdsa-sha2-nistp521," \          "ecdsa-sha2-nistp521," \
Line 89 
Line 93 
         "rsa-sha2-256," \          "rsa-sha2-256," \
         "ssh-rsa"          "ssh-rsa"
   
 #define PUBKEY_DEFAULT_PK_ALG   \  
         "sk-ecdsa-sha2-nistp256-cert-v01@openssh.com," \  
         "ecdsa-sha2-nistp256-cert-v01@openssh.com," \  
         "ecdsa-sha2-nistp384-cert-v01@openssh.com," \  
         "ecdsa-sha2-nistp521-cert-v01@openssh.com," \  
         "sk-ssh-ed25519-cert-v01@openssh.com," \  
         "ssh-ed25519-cert-v01@openssh.com," \  
         "rsa-sha2-512-cert-v01@openssh.com," \  
         "rsa-sha2-256-cert-v01@openssh.com," \  
         "ssh-rsa-cert-v01@openssh.com," \  
         "sk-ecdsa-sha2-nistp256@openssh.com," \  
         "ecdsa-sha2-nistp256," \  
         "ecdsa-sha2-nistp384," \  
         "ecdsa-sha2-nistp521," \  
         "sk-ssh-ed25519@openssh.com," \  
         "ssh-ed25519," \  
         "rsa-sha2-512," \  
         "rsa-sha2-256," \  
         "ssh-rsa"  
   
 #else /* WITH_OPENSSL */  #else /* WITH_OPENSSL */
   
 #define KEX_SERVER_KEX          \  #define KEX_SERVER_KEX          \
Line 117 
Line 101 
 #define KEX_DEFAULT_PK_ALG      \  #define KEX_DEFAULT_PK_ALG      \
         "ssh-ed25519-cert-v01@openssh.com," \          "ssh-ed25519-cert-v01@openssh.com," \
         "ssh-ed25519"          "ssh-ed25519"
 #define PUBKEY_DEFAULT_PK_ALG KEX_DEFAULT_PK_ALG  
 #define KEX_SERVER_ENCRYPT \  #define KEX_SERVER_ENCRYPT \
         "chacha20-poly1305@openssh.com," \          "chacha20-poly1305@openssh.com," \
         "aes128-ctr,aes192-ctr,aes256-ctr"          "aes128-ctr,aes192-ctr,aes256-ctr"
Legend:
Removed from v.1.62  
changed lines
  Added in v.1.63