4 files changed, 9 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f8b4a026..45939e6d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -112,6 +112,9 @@
    - dtucker@cvs.openbsd.org 2006/08/05 08:00:33
      [auth-skey.c]
      Add headers required to build with -DSKEY.  ok djm@
+   - dtucker@cvs.openbsd.org 2006/08/05 08:28:24
+     [monitor_wrap.c auth-skey.c auth2-chall.c]
+     Zap unused variables in -DSKEY code.  ok djm@
 
 20060804
  - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
@@ -5182,4 +5185,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4467 2006/08/05 08:48:01 dtucker Exp $
+$Id: ChangeLog,v 1.4468 2006/08/05 08:50:35 dtucker Exp $
diff --git a/auth-skey.c b/auth-skey.c
index 78e216340..147dab825 100644
--- a/auth-skey.c
+++ b/auth-skey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-skey.c,v 1.25 2006/08/05 08:00:33 dtucker Exp $ */
+/* $OpenBSD: auth-skey.c,v 1.26 2006/08/05 08:28:24 dtucker Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -51,8 +51,7 @@ skey_query(void *ctx, char **name, char **infotxt,
     u_int* numprompts, char ***prompts, u_int **echo_on)
 {
         Authctxt *authctxt = ctx;
-        char challenge[1024], *p;
-        int len;
+        char challenge[1024];
         struct skey skey;
 
         if (_compat_skeychallenge(&skey, authctxt->user, challenge,
diff --git a/auth2-chall.c b/auth2-chall.c
index 8358140b9..b091957b1 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-chall.c,v 1.30 2006/08/03 03:34:41 deraadt Exp $ */
+/* $OpenBSD: auth2-chall.c,v 1.31 2006/08/05 08:28:24 dtucker Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Per Allansson.  All rights reserved.
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 6678462d5..c00a0f7cb 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.c,v 1.51 2006/08/05 07:52:52 dtucker Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.52 2006/08/05 08:28:24 dtucker Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -941,9 +941,8 @@ mm_skey_query(void *ctx, char **name, char **infotxt,
    u_int *numprompts, char ***prompts, u_int **echo_on)
 {
         Buffer m;
-        int len;
         u_int success;
-        char *p, *challenge;
+        char *challenge;
 
         debug3("%s: entering", __func__);