- deraadt@cvs.openbsd.org 2006/03/19 18:53:12

     [kex.h myproposal.h]
     spacing

diff --git a/ChangeLog b/ChangeLog
index 51feebd44856c85d19443dab40f0e9676c5d53bc..358f4578419c8873c1de5177ba61c7d1aee6f9e0 100644 (file)
--- 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

diff --git a/kex.h b/kex.h
index e2ba0a98fa4f93b5bb10db89fea25cb972852263..25dabbaaae4b5065b596f48e073ba9e2e5f02876 100644 (file)
--- 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 @@ kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int,
     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 43c5402093c0f2b6900c296f71c6f48cf894ead9..f564b0d967dd8c12e60af8b2556e57b427e2d003 100644 (file)
--- 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"