Deleted Added
full compact
myproposal.h (69587) myproposal.h (76259)
1/* $OpenBSD: myproposal.h,v 1.12 2001/03/05 15:56:16 deraadt Exp $ */
2
1/*
2 * Copyright (c) 2000 Markus Friedl. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

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

17 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
18 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
19 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
20 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */
24#define KEX_DEFAULT_KEX "diffie-hellman-group-exchange-sha1,diffie-hellman-group1-sha1"
3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.

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

19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26#define KEX_DEFAULT_KEX "diffie-hellman-group-exchange-sha1,diffie-hellman-group1-sha1"
25#define KEX_DEFAULT_PK_ALG "ssh-dss"
27#define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss"
26#define KEX_DEFAULT_ENCRYPT \
28#define KEX_DEFAULT_ENCRYPT \
27 "3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \
28 "aes128-cbc,aes192-cbc,aes256-cbc," \
29 "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \
30 "aes192-cbc,aes256-cbc," \
29 "rijndael128-cbc,rijndael192-cbc,rijndael256-cbc," \
30 "rijndael-cbc@lysator.liu.se"
31 "rijndael128-cbc,rijndael192-cbc,rijndael256-cbc," \
32 "rijndael-cbc@lysator.liu.se"
31#define KEX_DEFAULT_MAC "hmac-sha1,hmac-md5,hmac-ripemd160@openssh.com"
33#define KEX_DEFAULT_MAC \
34 "hmac-md5,hmac-sha1,hmac-ripemd160," \
35 "hmac-ripemd160@openssh.com," \
36 "hmac-sha1-96,hmac-md5-96"
32#define KEX_DEFAULT_COMP "none,zlib"
33#define KEX_DEFAULT_LANG ""
34
35
36static char *myproposal[PROPOSAL_MAX] = {
37 KEX_DEFAULT_KEX,
38 KEX_DEFAULT_PK_ALG,
39 KEX_DEFAULT_ENCRYPT,
40 KEX_DEFAULT_ENCRYPT,
41 KEX_DEFAULT_MAC,
42 KEX_DEFAULT_MAC,
43 KEX_DEFAULT_COMP,
44 KEX_DEFAULT_COMP,
45 KEX_DEFAULT_LANG,
46 KEX_DEFAULT_LANG
47};
37#define KEX_DEFAULT_COMP "none,zlib"
38#define KEX_DEFAULT_LANG ""
39
40
41static char *myproposal[PROPOSAL_MAX] = {
42 KEX_DEFAULT_KEX,
43 KEX_DEFAULT_PK_ALG,
44 KEX_DEFAULT_ENCRYPT,
45 KEX_DEFAULT_ENCRYPT,
46 KEX_DEFAULT_MAC,
47 KEX_DEFAULT_MAC,
48 KEX_DEFAULT_COMP,
49 KEX_DEFAULT_COMP,
50 KEX_DEFAULT_LANG,
51 KEX_DEFAULT_LANG
52};