diff options
author | Damien Miller <djm@mindrot.org> | 2006-03-26 00:04:32 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-03-26 00:04:32 +1100 |
commit | 51b4f821231446fd36baf991a3d08dd83fc7f6e9 (patch) | |
tree | 9b040e53016962a4fe507277837ccf07b30ac202 | |
parent | b0fb6872ed2efe3a116083e43dd4f5f47cd4882b (diff) |
- deraadt@cvs.openbsd.org 2006/03/19 18:53:12
[kex.h myproposal.h]
spacing
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | kex.h | 4 | ||||
-rw-r--r-- | myproposal.h | 10 |
3 files changed, 11 insertions, 8 deletions
@@ -29,6 +29,9 @@ | |||
29 | [openbsd-compat/bsd-nextstep.c openbsd-compat/bsd-snprintf.c] | 29 | [openbsd-compat/bsd-nextstep.c openbsd-compat/bsd-snprintf.c] |
30 | [openbsd-compat/bsd-waitpid.c openbsd-compat/fake-rfc2553.c] | 30 | [openbsd-compat/bsd-waitpid.c openbsd-compat/fake-rfc2553.c] |
31 | RCSID() can die | 31 | RCSID() can die |
32 | - deraadt@cvs.openbsd.org 2006/03/19 18:53:12 | ||
33 | [kex.h myproposal.h] | ||
34 | spacing | ||
32 | 35 | ||
33 | 20060318 | 36 | 20060318 |
34 | - (djm) [auth-pam.c] Fix memleak in error path, from Coverity via | 37 | - (djm) [auth-pam.c] Fix memleak in error path, from Coverity via |
@@ -4221,4 +4224,4 @@ | |||
4221 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4224 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4222 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4225 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4223 | 4226 | ||
4224 | $Id: ChangeLog,v 1.4232 2006/03/25 13:03:21 djm Exp $ | 4227 | $Id: ChangeLog,v 1.4233 2006/03/25 13:04:32 djm Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.39 2006/03/07 09:07:40 djm Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.40 2006/03/19 18:53:12 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
@@ -144,7 +144,7 @@ kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int, | |||
144 | BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); | 144 | BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); |
145 | void | 145 | void |
146 | kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *, | 146 | kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *, |
147 | int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, | 147 | int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, |
148 | BIGNUM *, BIGNUM *, u_char **, u_int *); | 148 | BIGNUM *, BIGNUM *, u_char **, u_int *); |
149 | 149 | ||
150 | void | 150 | void |
diff --git a/myproposal.h b/myproposal.h index 43c540209..f564b0d96 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.19 2006/03/07 09:07:40 djm Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.20 2006/03/19 18:53:12 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -30,14 +30,14 @@ | |||
30 | #if OPENSSL_VERSION_NUMBER < 0x00907000L | 30 | #if OPENSSL_VERSION_NUMBER < 0x00907000L |
31 | # define KEX_DEFAULT_KEX \ | 31 | # define KEX_DEFAULT_KEX \ |
32 | "diffie-hellman-group-exchange-sha1," \ | 32 | "diffie-hellman-group-exchange-sha1," \ |
33 | "diffie-hellman-group14-sha1," \ | 33 | "diffie-hellman-group14-sha1," \ |
34 | "diffie-hellman-group1-sha1" | 34 | "diffie-hellman-group1-sha1" |
35 | #else | 35 | #else |
36 | # define KEX_DEFAULT_KEX \ | 36 | # define KEX_DEFAULT_KEX \ |
37 | "diffie-hellman-group-exchange-sha256," \ | 37 | "diffie-hellman-group-exchange-sha256," \ |
38 | "diffie-hellman-group-exchange-sha1," \ | 38 | "diffie-hellman-group-exchange-sha1," \ |
39 | "diffie-hellman-group14-sha1," \ | 39 | "diffie-hellman-group14-sha1," \ |
40 | "diffie-hellman-group1-sha1" | 40 | "diffie-hellman-group1-sha1" |
41 | #endif | 41 | #endif |
42 | 42 | ||
43 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" | 43 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" |