|
Lines 69-80
Link Here
|
| 69 |
#ifdef HAVE_EVP_SHA256 |
69 |
#ifdef HAVE_EVP_SHA256 |
| 70 |
# define KEX_SHA256_METHODS \ |
70 |
# define KEX_SHA256_METHODS \ |
| 71 |
"diffie-hellman-group-exchange-sha256," |
71 |
"diffie-hellman-group-exchange-sha256," |
| 72 |
#define SHA2_HMAC_MODES \ |
72 |
# define SHA2_HMAC_MODES \ |
| 73 |
"hmac-sha2-256," \ |
73 |
"hmac-sha2-256," \ |
| 74 |
"hmac-sha2-512," |
74 |
"hmac-sha2-512," |
|
|
75 |
# define SHA2_HMAC_ETM_MODES \ |
| 76 |
"hmac-sha2-256-etm@openssh.com," \ |
| 77 |
"hmac-sha2-512-etm@openssh.com," |
| 75 |
#else |
78 |
#else |
| 76 |
# define KEX_SHA256_METHODS |
79 |
# define KEX_SHA256_METHODS |
| 77 |
# define SHA2_HMAC_MODES |
80 |
# define SHA2_HMAC_MODES |
|
|
81 |
# define SHA2_HMAC_ETM_MODES |
| 78 |
#endif |
82 |
#endif |
| 79 |
|
83 |
|
| 80 |
#ifdef WITH_OPENSSL |
84 |
#ifdef WITH_OPENSSL |
|
Lines 118-130
Link Here
|
| 118 |
#define KEX_SERVER_MAC \ |
122 |
#define KEX_SERVER_MAC \ |
| 119 |
"umac-64-etm@openssh.com," \ |
123 |
"umac-64-etm@openssh.com," \ |
| 120 |
"umac-128-etm@openssh.com," \ |
124 |
"umac-128-etm@openssh.com," \ |
| 121 |
"hmac-sha2-256-etm@openssh.com," \ |
125 |
SHA2_HMAC_ETM_MODES \ |
| 122 |
"hmac-sha2-512-etm@openssh.com," \ |
|
|
| 123 |
"hmac-sha1-etm@openssh.com," \ |
126 |
"hmac-sha1-etm@openssh.com," \ |
| 124 |
"umac-64@openssh.com," \ |
127 |
"umac-64@openssh.com," \ |
| 125 |
"umac-128@openssh.com," \ |
128 |
"umac-128@openssh.com," \ |
| 126 |
"hmac-sha2-256," \ |
129 |
SHA2_HMAC_MODES \ |
| 127 |
"hmac-sha2-512," \ |
|
|
| 128 |
"hmac-sha1" |
130 |
"hmac-sha1" |
| 129 |
|
131 |
|
| 130 |
#define KEX_CLIENT_MAC KEX_SERVER_MAC |
132 |
#define KEX_CLIENT_MAC KEX_SERVER_MAC |
|
Lines 142-154
Link Here
|
| 142 |
#define KEX_SERVER_MAC \ |
144 |
#define KEX_SERVER_MAC \ |
| 143 |
"umac-64-etm@openssh.com," \ |
145 |
"umac-64-etm@openssh.com," \ |
| 144 |
"umac-128-etm@openssh.com," \ |
146 |
"umac-128-etm@openssh.com," \ |
| 145 |
"hmac-sha2-256-etm@openssh.com," \ |
147 |
SHA2_HMAC_ETM_MODES \ |
| 146 |
"hmac-sha2-512-etm@openssh.com," \ |
|
|
| 147 |
"hmac-sha1-etm@openssh.com," \ |
148 |
"hmac-sha1-etm@openssh.com," \ |
| 148 |
"umac-64@openssh.com," \ |
149 |
"umac-64@openssh.com," \ |
| 149 |
"umac-128@openssh.com," \ |
150 |
"umac-128@openssh.com," \ |
| 150 |
"hmac-sha2-256," \ |
151 |
SHA2_HMAC_MODES \ |
| 151 |
"hmac-sha2-512," \ |
|
|
| 152 |
"hmac-sha1" |
152 |
"hmac-sha1" |
| 153 |
|
153 |
|
| 154 |
#define KEX_CLIENT_KEX KEX_SERVER_KEX |
154 |
#define KEX_CLIENT_KEX KEX_SERVER_KEX |