myproposal.h (538354481ef7dbcd76ebc7334512a9d60994b84e) myproposal.h (9ded33068ebc84932a4e78ecb1d5516698fa7144)
1/* $OpenBSD: myproposal.h,v 1.50 2016/02/09 05:30:04 djm Exp $ */
2/* $FreeBSD$ */
3
4/*
5 * Copyright (c) 2000 Markus Friedl. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 86 unchanged lines hidden (view full) ---

95#define KEX_CLIENT_KEX KEX_COMMON_KEX \
96 "diffie-hellman-group-exchange-sha1," \
97 "diffie-hellman-group14-sha1"
98
99#define KEX_DEFAULT_PK_ALG \
100 HOSTKEY_ECDSA_CERT_METHODS \
101 "ssh-ed25519-cert-v01@openssh.com," \
102 "ssh-rsa-cert-v01@openssh.com," \
1/* $OpenBSD: myproposal.h,v 1.50 2016/02/09 05:30:04 djm Exp $ */
2/* $FreeBSD$ */
3
4/*
5 * Copyright (c) 2000 Markus Friedl. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 86 unchanged lines hidden (view full) ---

95#define KEX_CLIENT_KEX KEX_COMMON_KEX \
96 "diffie-hellman-group-exchange-sha1," \
97 "diffie-hellman-group14-sha1"
98
99#define KEX_DEFAULT_PK_ALG \
100 HOSTKEY_ECDSA_CERT_METHODS \
101 "ssh-ed25519-cert-v01@openssh.com," \
102 "ssh-rsa-cert-v01@openssh.com," \
103 "ssh-dss-cert-v01@openssh.com," \
104 HOSTKEY_ECDSA_METHODS \
105 "ssh-ed25519," \
106 "rsa-sha2-512," \
107 "rsa-sha2-256," \
103 HOSTKEY_ECDSA_METHODS \
104 "ssh-ed25519," \
105 "rsa-sha2-512," \
106 "rsa-sha2-256," \
108 "ssh-rsa," \
109 "ssh-dss"
107 "ssh-rsa"
110
111/* the actual algorithms */
112
113#define KEX_SERVER_ENCRYPT \
114 "chacha20-poly1305@openssh.com," \
115 "aes128-ctr,aes192-ctr,aes256-ctr" \
116 AESGCM_CIPHER_MODES \
117 ",aes128-cbc,aes192-cbc,aes256-cbc"

--- 73 unchanged lines hidden --- 		108
109/* the actual algorithms */
110
111#define KEX_SERVER_ENCRYPT \
112 "chacha20-poly1305@openssh.com," \
113 "aes128-ctr,aes192-ctr,aes256-ctr" \
114 AESGCM_CIPHER_MODES \
115 ",aes128-cbc,aes192-cbc,aes256-cbc"

--- 73 unchanged lines hidden ---