From cee85233149eb16c45132170d3f067496f17c368 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 6 Mar 2009 00:58:22 +1100 Subject: - djm@cvs.openbsd.org 2009/03/05 07:18:19 [auth2-jpake.c jpake.c jpake.h monitor_wrap.c monitor_wrap.h schnorr.c] [sshconnect2.c] refactor the (disabled) Schnorr proof code to make it a little more generally useful --- auth2-jpake.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'auth2-jpake.c') diff --git a/auth2-jpake.c b/auth2-jpake.c index efe7ff2a3..6092e31c0 100644 --- a/auth2-jpake.c +++ b/auth2-jpake.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-jpake.c,v 1.2 2008/11/07 23:34:48 dtucker Exp $ */ +/* $OpenBSD: auth2-jpake.c,v 1.3 2009/03/05 07:18:19 djm Exp $ */ /* * Copyright (c) 2008 Damien Miller. All rights reserved. * @@ -55,6 +55,7 @@ #endif #include "monitor_wrap.h" +#include "schnorr.h" #include "jpake.h" /* @@ -359,7 +360,7 @@ auth2_jpake_get_pwdata(Authctxt *authctxt, BIGNUM **s, } /* - * Being authentication attempt. + * Begin authentication attempt. * Note, sets authctxt->postponed while in subprotocol */ static int -- cgit v1.2.3 From 43e7a358ff9476fb77bc1b475530ce4c6b152ccc Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sun, 21 Jun 2009 19:50:08 +1000 Subject: - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and header-order changes to reduce diff vs OpenBSD. --- ChangeLog | 2 ++ auth2-jpake.c | 2 +- auth2.c | 2 +- canohost.h | 2 +- session.c | 6 +++--- 5 files changed, 8 insertions(+), 6 deletions(-) (limited to 'auth2-jpake.c') diff --git a/ChangeLog b/ChangeLog index c816276cc..629c482df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -105,6 +105,8 @@ [roaming.h roaming_common.c roaming_dummy.c] Add tags for the benefit of the sync scripts Also: pull in the changes for 1.1->1.2 missed in the previous sync. + - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and + header-order changes to reduce diff vs OpenBSD. 20090616 - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t diff --git a/auth2-jpake.c b/auth2-jpake.c index 6092e31c0..5de5506a6 100644 --- a/auth2-jpake.c +++ b/auth2-jpake.c @@ -42,8 +42,8 @@ #include "ssh2.h" #include "key.h" #include "hostfile.h" -#include "buffer.h" #include "auth.h" +#include "buffer.h" #include "packet.h" #include "dispatch.h" #include "log.h" diff --git a/auth2.c b/auth2.c index ecf857052..92e6f5842 100644 --- a/auth2.c +++ b/auth2.c @@ -35,8 +35,8 @@ #include #include -#include "xmalloc.h" #include "atomicio.h" +#include "xmalloc.h" #include "ssh2.h" #include "packet.h" #include "log.h" diff --git a/canohost.h b/canohost.h index 64000f5eb..4c8636f42 100644 --- a/canohost.h +++ b/canohost.h @@ -24,6 +24,6 @@ char *get_local_name(int); int get_remote_port(void); int get_local_port(void); int get_sock_port(int, int); -void clear_cached_addr(void); +void clear_cached_addr(void); void ipv64_normalise_mapped(struct sockaddr_storage *, socklen_t *); diff --git a/session.c b/session.c index f04266f78..cdbf88ab7 100644 --- a/session.c +++ b/session.c @@ -715,8 +715,8 @@ do_exec_pty(Session *s, const char *command) * Do common processing for the child, such as execing * the command. */ - do_child(s, command); - /* NOTREACHED */ + do_child(s, command); + /* NOTREACHED */ default: break; } @@ -845,7 +845,7 @@ do_login(Session *s, const char *command) fromlen = sizeof(from); if (packet_connection_is_on_socket()) { if (getpeername(packet_get_connection_in(), - (struct sockaddr *) & from, &fromlen) < 0) { + (struct sockaddr *)&from, &fromlen) < 0) { debug("getpeername: %.100s", strerror(errno)); cleanup_exit(255); } -- cgit v1.2.3