[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.38 and 1.39

version 1.38, 2014/03/27 23:01:27 version 1.39, 2014/04/29 18:01:49
Line 24 
Line 24 
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */   */
   
   #ifdef WITH_OPENSSL
   
 #define KEX_SERVER_KEX          \  #define KEX_SERVER_KEX          \
         "curve25519-sha256@libssh.org," \          "curve25519-sha256@libssh.org," \
         "ecdh-sha2-nistp256," \          "ecdh-sha2-nistp256," \
Line 84 
Line 86 
         "hmac-ripemd160@openssh.com," \          "hmac-ripemd160@openssh.com," \
         "hmac-sha1-96," \          "hmac-sha1-96," \
         "hmac-md5-96"          "hmac-md5-96"
   
   #else
   
   #define KEX_SERVER_KEX          \
           "curve25519-sha256@libssh.org"
   #define KEX_DEFAULT_PK_ALG      \
           "ssh-ed25519-cert-v01@openssh.com," \
           "ssh-ed25519"
   #define KEX_SERVER_ENCRYPT \
           "aes128-ctr,aes192-ctr,aes256-ctr," \
           "chacha20-poly1305@openssh.com"
   #define KEX_SERVER_MAC \
           "hmac-sha2-256-etm@openssh.com," \
           "hmac-sha2-512-etm@openssh.com," \
           "hmac-sha2-256," \
           "hmac-sha2-512"
   
   #define KEX_CLIENT_KEX KEX_SERVER_KEX
   #define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT
   #define KEX_CLIENT_MAC KEX_SERVER_MAC "," \
           "hmac-sha1-etm@openssh.com," \
           "hmac-sha1"
   
   #endif /* WITH_OPENSSL */
   
 #define KEX_DEFAULT_COMP        "none,zlib@openssh.com,zlib"  #define KEX_DEFAULT_COMP        "none,zlib@openssh.com,zlib"
 #define KEX_DEFAULT_LANG        ""  #define KEX_DEFAULT_LANG        ""
Legend:
Removed from v.1.38  
changed lines
  Added in v.1.39