mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-26 03:42:07 +00:00
e45796f7b4
[kex.h mac.c mac.h monitor_wrap.c myproposal.h packet.c ssh.1]
[ssh_config.5 sshd.8 sshd_config.5]
Add a new MAC algorithm for data integrity, UMAC-64 (not default yet,
must specify umac-64@openssh.com). Provides about 20% end-to-end speedup
compared to hmac-md5. Represents a different approach to message
authentication to that of HMAC that may be beneficial if HMAC based on
one of its underlying hash algorithms is found to be vulnerable to a
new attack. http://www.ietf.org/rfc/rfc4418.txt
in conjunction with and OK djm@
69 lines
2.5 KiB
C
69 lines
2.5 KiB
C
/* $OpenBSD: myproposal.h,v 1.22 2007/06/07 19:37:34 pvalchev Exp $ */
|
|
|
|
/*
|
|
* Copyright (c) 2000 Markus Friedl. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <openssl/opensslv.h>
|
|
|
|
/* Old OpenSSL doesn't support what we need for DHGEX-sha256 */
|
|
#if OPENSSL_VERSION_NUMBER < 0x00907000L
|
|
# define KEX_DEFAULT_KEX \
|
|
"diffie-hellman-group-exchange-sha1," \
|
|
"diffie-hellman-group14-sha1," \
|
|
"diffie-hellman-group1-sha1"
|
|
#else
|
|
# define KEX_DEFAULT_KEX \
|
|
"diffie-hellman-group-exchange-sha256," \
|
|
"diffie-hellman-group-exchange-sha1," \
|
|
"diffie-hellman-group14-sha1," \
|
|
"diffie-hellman-group1-sha1"
|
|
#endif
|
|
|
|
#define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss"
|
|
#define KEX_DEFAULT_ENCRYPT \
|
|
"aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \
|
|
"arcfour128,arcfour256,arcfour," \
|
|
"aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se," \
|
|
"aes128-ctr,aes192-ctr,aes256-ctr"
|
|
#define KEX_DEFAULT_MAC \
|
|
"hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160," \
|
|
"hmac-ripemd160@openssh.com," \
|
|
"hmac-sha1-96,hmac-md5-96"
|
|
#define KEX_DEFAULT_COMP "none,zlib@openssh.com,zlib"
|
|
#define KEX_DEFAULT_LANG ""
|
|
|
|
|
|
static char *myproposal[PROPOSAL_MAX] = {
|
|
KEX_DEFAULT_KEX,
|
|
KEX_DEFAULT_PK_ALG,
|
|
KEX_DEFAULT_ENCRYPT,
|
|
KEX_DEFAULT_ENCRYPT,
|
|
KEX_DEFAULT_MAC,
|
|
KEX_DEFAULT_MAC,
|
|
KEX_DEFAULT_COMP,
|
|
KEX_DEFAULT_COMP,
|
|
KEX_DEFAULT_LANG,
|
|
KEX_DEFAULT_LANG
|
|
};
|