[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.58 and 1.59

version 1.58, 2019/02/23 08:20:43 version 1.59, 2019/10/31 21:17:49
Line 87 
Line 87 
         "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," \
           "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," \
           "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 95 
Line 113 
 #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"
Line 115 
Line 134 
 #define KEX_CLIENT_MAC KEX_SERVER_MAC  #define KEX_CLIENT_MAC KEX_SERVER_MAC
   
 #define SSH_ALLOWED_CA_SIGALGS  "ssh-ed25519"  #define SSH_ALLOWED_CA_SIGALGS  "ssh-ed25519"
   
   #define PUBKEY_DEFAULT_PK_ALG   \
           "ssh-ed25519-cert-v01@openssh.com," \
           "ssh-ed25519"
   
 #endif /* WITH_OPENSSL */  #endif /* WITH_OPENSSL */
   

Legend:
Removed from v.1.58  
changed lines
  Added in v.1.59