diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-03-19 18:53:13 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-03-19 18:53:13 +0000 |
| commit | 9643d67d8e8ef1f8bb5f43ecf5927d708115084e (patch) | |
| tree | b551e9794bd9bf140a0a6a834b50a6190895b8fa | |
| parent | 6e4298a8c6994873b7f5ff6edd7d0569b19a91e1 (diff) | |
spacing
| -rw-r--r-- | usr.bin/ssh/kex.c | 2 | ||||
| -rw-r--r-- | usr.bin/ssh/kex.h | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/monitor.c | 2 | ||||
| -rw-r--r-- | usr.bin/ssh/myproposal.h | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/session.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/ssh/kex.c b/usr.bin/ssh/kex.c index 37d94706691..d4bcc18bbca 100644 --- a/usr.bin/ssh/kex.c +++ b/usr.bin/ssh/kex.c @@ -424,7 +424,7 @@ derive_key(Kex *kex, int id, u_int need, u_char *hash, u_int hashlen, if ((mdsz = EVP_MD_size(kex->evp_md)) <= 0) fatal("bad kex md size %d", mdsz); - digest = xmalloc(roundup(need, mdsz)); + digest = xmalloc(roundup(need, mdsz)); buffer_init(&b); buffer_put_bignum2(&b, shared_secret); diff --git a/usr.bin/ssh/kex.h b/usr.bin/ssh/kex.h index e2ba0a98fa4..25dabbaaae4 100644 --- a/usr.bin/ssh/kex.h +++ b/usr.bin/ssh/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/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c index 2ea5057a20f..87474fc7a41 100644 --- a/usr.bin/ssh/monitor.c +++ b/usr.bin/ssh/monitor.c @@ -479,7 +479,7 @@ mm_answer_sign(int sock, Buffer *m) p = buffer_get_string(m, &datlen); /* - * Supported KEX types will only return SHA1 (20 byte) or + * Supported KEX types will only return SHA1 (20 byte) or * SHA256 (32 byte) hashes */ if (datlen != 20 && datlen != 32) diff --git a/usr.bin/ssh/myproposal.h b/usr.bin/ssh/myproposal.h index cc94a8ed2b4..bdf06d63915 100644 --- a/usr.bin/ssh/myproposal.h +++ b/usr.bin/ssh/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. @@ -26,8 +26,8 @@ #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" #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" #define KEX_DEFAULT_ENCRYPT \ "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c index 7f12a9b5b42..3f81fe2fc61 100644 --- a/usr.bin/ssh/session.c +++ b/usr.bin/ssh/session.c @@ -1818,7 +1818,7 @@ session_exit_message(Session *s, int status) /* * Adjust cleanup callback attachment to send close messages when - * the channel gets EOF. The session will be then be closed + * the channel gets EOF. The session will be then be closed * by session_close_by_channel when the childs close their fds. */ channel_register_cleanup(c->self, session_close_by_channel, 1); |