src/usr.bin/ssh/myproposal.h - diff

Return to myproposal.h CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/myproposal.h between version 1.65 and 1.66

-version 1.65, 2020/01/22 04:58:23
+version 1.66, 2020/01/23 02:46:49
 Line 24
 Line 24
 Line 24
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
- #ifdef WITH_OPENSSL
  #define KEX_SERVER_KEX  \
          "curve25519-sha256," \
          "curve25519-sha256@libssh.org," \
-Line 91
+Line 89
 Line 91
 Line 89
          "rsa-sha2-512," \
          "rsa-sha2-256," \
          "ssh-rsa"
- #else /* WITH_OPENSSL */
- #define KEX_SERVER_KEX          \
-         "curve25519-sha256," \
-         "curve25519-sha256@libssh.org"
- #define KEX_DEFAULT_PK_ALG      \
-         "ssh-ed25519-cert-v01@openssh.com," \
-         "ssh-ed25519"
- #define KEX_SERVER_ENCRYPT \
-         "chacha20-poly1305@openssh.com," \
-         "aes128-ctr,aes192-ctr,aes256-ctr"
- #define KEX_SERVER_MAC \
-         "umac-64-etm@openssh.com," \
-         "umac-128-etm@openssh.com," \
-         "hmac-sha2-256-etm@openssh.com," \
-         "hmac-sha2-512-etm@openssh.com," \
-         "hmac-sha1-etm@openssh.com," \
-         "umac-64@openssh.com," \
-         "umac-128@openssh.com," \
-         "hmac-sha2-256," \
-         "hmac-sha2-512," \
-         "hmac-sha1"
- #define KEX_CLIENT_KEX KEX_SERVER_KEX
- #define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT
- #define KEX_CLIENT_MAC KEX_SERVER_MAC
- #define SSH_ALLOWED_CA_SIGALGS  "ssh-ed25519,sk-ssh-ed25519@openssh.com"
- #endif /* WITH_OPENSSL */
  #define KEX_DEFAULT_COMP        "none,zlib@openssh.com"
  #define KEX_DEFAULT_LANG        ""