Deleted Added
full compact
myproposal.h (124211) myproposal.h (137019)
1/* $OpenBSD: myproposal.h,v 1.15 2003/05/17 04:27:52 markus Exp $ */
2/* $FreeBSD: head/crypto/openssh/myproposal.h 124211 2004-01-07 11:16:27Z des $ */
1/* $OpenBSD: myproposal.h,v 1.16 2004/06/13 12:53:24 djm Exp $ */
2/* $FreeBSD: head/crypto/openssh/myproposal.h 137019 2004-10-28 16:11:31Z des $ */
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
9 * are met:
10 * 1. Redistributions of source code must retain the above copyright

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

19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
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
9 * are met:
10 * 1. Redistributions of source code must retain the above copyright

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

19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
21 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
23 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27#define KEX_DEFAULT_KEX "diffie-hellman-group-exchange-sha1,diffie-hellman-group1-sha1"
27#define KEX_DEFAULT_KEX "diffie-hellman-group-exchange-sha1," \
28 "diffie-hellman-group14-sha1," \
29 "diffie-hellman-group1-sha1"
28#define KEX_DEFAULT_PK_ALG "ssh-dss,ssh-rsa"
29#define KEX_DEFAULT_ENCRYPT \
30 "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \
31 "aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se," \
32 "aes128-ctr,aes192-ctr,aes256-ctr"
33#define KEX_DEFAULT_MAC \
34 "hmac-md5,hmac-sha1,hmac-ripemd160," \
35 "hmac-ripemd160@openssh.com," \

--- 17 unchanged lines hidden ---
30#define KEX_DEFAULT_PK_ALG "ssh-dss,ssh-rsa"
31#define KEX_DEFAULT_ENCRYPT \
32 "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \
33 "aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se," \
34 "aes128-ctr,aes192-ctr,aes256-ctr"
35#define KEX_DEFAULT_MAC \
36 "hmac-md5,hmac-sha1,hmac-ripemd160," \
37 "hmac-ripemd160@openssh.com," \

--- 17 unchanged lines hidden ---