From c6d744e9cdce63c250da4f87279d7da459ff4423 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 11 Nov 2008 16:33:03 +1100 Subject: - dtucker@cvs.openbsd.org 2008/11/07 23:34:48 [auth2-jpake.c] Move JPAKE define to make life easier for portable. ok djm@ --- ChangeLog | 5 ++++- auth2-jpake.c | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e3a7190ea..0ee6df733 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,9 @@ - stevesk@cvs.openbsd.org 2008/11/07 18:50:18 [nchan.c] add space to some log/debug messages for readability; ok djm@ markus@ + - dtucker@cvs.openbsd.org 2008/11/07 23:34:48 + [auth2-jpake.c] + Move JPAKE define to make life easier for portable. ok djm@ 20081105 - OpenBSD CVS Sync @@ -4902,4 +4905,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.5135 2008/11/11 05:32:25 dtucker Exp $ +$Id: ChangeLog,v 1.5136 2008/11/11 05:33:03 dtucker Exp $ diff --git a/auth2-jpake.c b/auth2-jpake.c index 0029ec26b..efe7ff2a3 100644 --- a/auth2-jpake.c +++ b/auth2-jpake.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-jpake.c,v 1.1 2008/11/04 08:22:12 djm Exp $ */ +/* $OpenBSD: auth2-jpake.c,v 1.2 2008/11/07 23:34:48 dtucker Exp $ */ /* * Copyright (c) 2008 Damien Miller. All rights reserved. * @@ -25,6 +25,8 @@ * http://grouper.ieee.org/groups/1363/Research/contributions/hao-ryan-2008.pdf */ +#ifdef JPAKE + #include #include @@ -55,8 +57,6 @@ #include "jpake.h" -#ifdef JPAKE - /* * XXX options->permit_empty_passwd (at the moment, they will be refused * anyway because they will mismatch on fake salt. -- cgit v1.2.3