Changeset View
Changeset View
Standalone View
Standalone View
myproposal.h
/* $OpenBSD: myproposal.h,v 1.57 2018/09/12 01:34:02 djm Exp $ */ | /* $OpenBSD: myproposal.h,v 1.58 2019/02/23 08:20:43 djm Exp $ */ | ||||
/* | /* | ||||
* Copyright (c) 2000 Markus Friedl. All rights reserved. | * Copyright (c) 2000 Markus Friedl. All rights reserved. | ||||
* | * | ||||
* Redistribution and use in source and binary forms, with or without | * Redistribution and use in source and binary forms, with or without | ||||
* modification, are permitted provided that the following conditions | * modification, are permitted provided that the following conditions | ||||
* are met: | * are met: | ||||
* 1. Redistributions of source code must retain the above copyright | * 1. Redistributions of source code must retain the above copyright | ||||
▲ Show 20 Lines • Show All 75 Lines • ▼ Show 20 Lines | |||||
#ifdef WITH_OPENSSL | #ifdef WITH_OPENSSL | ||||
# ifdef HAVE_EVP_SHA256 | # ifdef HAVE_EVP_SHA256 | ||||
# define KEX_CURVE25519_METHODS \ | # define KEX_CURVE25519_METHODS \ | ||||
"curve25519-sha256," \ | "curve25519-sha256," \ | ||||
"curve25519-sha256@libssh.org," | "curve25519-sha256@libssh.org," | ||||
# else | # else | ||||
# define KEX_CURVE25519_METHODS "" | # define KEX_CURVE25519_METHODS "" | ||||
# endif | # endif | ||||
#define KEX_COMMON_KEX \ | #define KEX_SERVER_KEX \ | ||||
KEX_CURVE25519_METHODS \ | KEX_CURVE25519_METHODS \ | ||||
KEX_ECDH_METHODS \ | KEX_ECDH_METHODS \ | ||||
KEX_SHA2_METHODS | KEX_SHA2_METHODS \ | ||||
#define KEX_SERVER_KEX KEX_COMMON_KEX \ | |||||
KEX_SHA2_GROUP14 \ | KEX_SHA2_GROUP14 \ | ||||
"diffie-hellman-group14-sha1" \ | |||||
#define KEX_CLIENT_KEX KEX_COMMON_KEX \ | |||||
"diffie-hellman-group-exchange-sha1," \ | |||||
KEX_SHA2_GROUP14 \ | |||||
"diffie-hellman-group14-sha1" | "diffie-hellman-group14-sha1" | ||||
#define KEX_CLIENT_KEX KEX_SERVER_KEX | |||||
#define KEX_DEFAULT_PK_ALG \ | #define KEX_DEFAULT_PK_ALG \ | ||||
HOSTKEY_ECDSA_CERT_METHODS \ | HOSTKEY_ECDSA_CERT_METHODS \ | ||||
"ssh-ed25519-cert-v01@openssh.com," \ | "ssh-ed25519-cert-v01@openssh.com," \ | ||||
"rsa-sha2-512-cert-v01@openssh.com," \ | "rsa-sha2-512-cert-v01@openssh.com," \ | ||||
"rsa-sha2-256-cert-v01@openssh.com," \ | "rsa-sha2-256-cert-v01@openssh.com," \ | ||||
"ssh-rsa-cert-v01@openssh.com," \ | "ssh-rsa-cert-v01@openssh.com," \ | ||||
HOSTKEY_ECDSA_METHODS \ | HOSTKEY_ECDSA_METHODS \ | ||||
"ssh-ed25519," \ | "ssh-ed25519," \ | ||||
Show All 21 Lines | #define KEX_SERVER_MAC \ | ||||
"hmac-sha2-256," \ | "hmac-sha2-256," \ | ||||
"hmac-sha2-512," \ | "hmac-sha2-512," \ | ||||
"hmac-sha1" | "hmac-sha1" | ||||
#define KEX_CLIENT_MAC KEX_SERVER_MAC | #define KEX_CLIENT_MAC KEX_SERVER_MAC | ||||
/* Not a KEX value, but here so all the algorithm defaults are together */ | /* Not a KEX value, but here so all the algorithm defaults are together */ | ||||
#define SSH_ALLOWED_CA_SIGALGS \ | #define SSH_ALLOWED_CA_SIGALGS \ | ||||
"ecdsa-sha2-nistp256," \ | HOSTKEY_ECDSA_METHODS \ | ||||
"ecdsa-sha2-nistp384," \ | |||||
"ecdsa-sha2-nistp521," \ | |||||
"ssh-ed25519," \ | "ssh-ed25519," \ | ||||
"rsa-sha2-512," \ | "rsa-sha2-512," \ | ||||
"rsa-sha2-256," \ | "rsa-sha2-256," \ | ||||
"ssh-rsa" | "ssh-rsa" | ||||
#else /* WITH_OPENSSL */ | #else /* WITH_OPENSSL */ | ||||
#define KEX_SERVER_KEX \ | #define KEX_SERVER_KEX \ | ||||
▲ Show 20 Lines • Show All 55 Lines • Show Last 20 Lines |