diff options
author | Damien Miller <djm@mindrot.org> | 2006-03-26 13:58:55 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-03-26 13:58:55 +1100 |
commit | c91e556d8a2cf97a5d7075154d39eb8fd4098fe4 (patch) | |
tree | a1fc7a2f2fd92087fd6eb3dff354d9982c62733e | |
parent | d62f2ca376168c716e4b485512a2b62b461e45b2 (diff) |
- deraadt@cvs.openbsd.org 2006/03/19 18:53:12
[kex.c kex.h monitor.c myproposal.h session.c]
spacing
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | kex.c | 2 | ||||
-rw-r--r-- | monitor.c | 2 | ||||
-rw-r--r-- | session.c | 2 |
4 files changed, 7 insertions, 4 deletions
@@ -40,6 +40,9 @@ | |||
40 | - deraadt@cvs.openbsd.org 2006/03/19 18:52:11 | 40 | - deraadt@cvs.openbsd.org 2006/03/19 18:52:11 |
41 | [auth1.c authfd.c channels.c] | 41 | [auth1.c authfd.c channels.c] |
42 | spacing | 42 | spacing |
43 | - deraadt@cvs.openbsd.org 2006/03/19 18:53:12 | ||
44 | [kex.c kex.h monitor.c myproposal.h session.c] | ||
45 | spacing | ||
43 | 46 | ||
44 | 20060325 | 47 | 20060325 |
45 | - OpenBSD CVS Sync | 48 | - OpenBSD CVS Sync |
@@ -4297,4 +4300,4 @@ | |||
4297 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4300 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4298 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4301 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4299 | 4302 | ||
4300 | $Id: ChangeLog,v 1.4252 2006/03/26 02:57:41 djm Exp $ | 4303 | $Id: ChangeLog,v 1.4253 2006/03/26 02:58:55 djm Exp $ |
@@ -432,7 +432,7 @@ derive_key(Kex *kex, int id, u_int need, u_char *hash, u_int hashlen, | |||
432 | 432 | ||
433 | if ((mdsz = EVP_MD_size(kex->evp_md)) <= 0) | 433 | if ((mdsz = EVP_MD_size(kex->evp_md)) <= 0) |
434 | fatal("bad kex md size %d", mdsz); | 434 | fatal("bad kex md size %d", mdsz); |
435 | digest = xmalloc(roundup(need, mdsz)); | 435 | digest = xmalloc(roundup(need, mdsz)); |
436 | 436 | ||
437 | buffer_init(&b); | 437 | buffer_init(&b); |
438 | buffer_put_bignum2(&b, shared_secret); | 438 | buffer_put_bignum2(&b, shared_secret); |
@@ -545,7 +545,7 @@ mm_answer_sign(int sock, Buffer *m) | |||
545 | p = buffer_get_string(m, &datlen); | 545 | p = buffer_get_string(m, &datlen); |
546 | 546 | ||
547 | /* | 547 | /* |
548 | * Supported KEX types will only return SHA1 (20 byte) or | 548 | * Supported KEX types will only return SHA1 (20 byte) or |
549 | * SHA256 (32 byte) hashes | 549 | * SHA256 (32 byte) hashes |
550 | */ | 550 | */ |
551 | if (datlen != 20 && datlen != 32) | 551 | if (datlen != 20 && datlen != 32) |
@@ -2190,7 +2190,7 @@ session_exit_message(Session *s, int status) | |||
2190 | 2190 | ||
2191 | /* | 2191 | /* |
2192 | * Adjust cleanup callback attachment to send close messages when | 2192 | * Adjust cleanup callback attachment to send close messages when |
2193 | * the channel gets EOF. The session will be then be closed | 2193 | * the channel gets EOF. The session will be then be closed |
2194 | * by session_close_by_channel when the childs close their fds. | 2194 | * by session_close_by_channel when the childs close their fds. |
2195 | */ | 2195 | */ |
2196 | channel_register_cleanup(c->self, session_close_by_channel, 1); | 2196 | channel_register_cleanup(c->self, session_close_by_channel, 1); |