- deraadt@cvs.openbsd.org 2006/03/19 18:53:12
[kex.h myproposal.h]
spacing
diff --git a/ChangeLog b/ChangeLog
index 64a20a4..ad9213e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,9 @@
[openbsd-compat/bsd-nextstep.c openbsd-compat/bsd-snprintf.c]
[openbsd-compat/bsd-waitpid.c openbsd-compat/fake-rfc2553.c]
RCSID() can die
+ - deraadt@cvs.openbsd.org 2006/03/19 18:53:12
+ [kex.h myproposal.h]
+ spacing
20060318
- (djm) [auth-pam.c] Fix memleak in error path, from Coverity via
@@ -4221,4 +4224,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4232 2006/03/25 13:03:21 djm Exp $
+$Id: ChangeLog,v 1.4233 2006/03/25 13:04:32 djm Exp $
diff --git a/kex.h b/kex.h
index e2ba0a9..25dabba 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.39 2006/03/07 09:07:40 djm Exp $ */
+/* $OpenBSD: kex.h,v 1.40 2006/03/19 18:53:12 deraadt Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -144,7 +144,7 @@
BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *);
void
kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
- int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *,
+ int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *,
BIGNUM *, BIGNUM *, u_char **, u_int *);
void
diff --git a/myproposal.h b/myproposal.h
index 43c5402..f564b0d 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.19 2006/03/07 09:07:40 djm Exp $ */
+/* $OpenBSD: myproposal.h,v 1.20 2006/03/19 18:53:12 deraadt Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -30,14 +30,14 @@
#if OPENSSL_VERSION_NUMBER < 0x00907000L
# define KEX_DEFAULT_KEX \
"diffie-hellman-group-exchange-sha1," \
- "diffie-hellman-group14-sha1," \
- "diffie-hellman-group1-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"
+ "diffie-hellman-group14-sha1," \
+ "diffie-hellman-group1-sha1"
#endif
#define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss"