summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-08-05 18:50:35 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-08-05 18:50:35 +1000
commitd6a23f20572f2abc9c1935da6b68b1979f8f83de (patch)
tree58bef1790405390f93b7de93e32efa9aef7402bc
parent260cb3519db3bdc3722b76638edfcecfd885608b (diff)
- 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@
-rw-r--r--ChangeLog5
-rw-r--r--auth-skey.c5
-rw-r--r--auth2-chall.c2
-rw-r--r--monitor_wrap.c5
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 @@
112 - dtucker@cvs.openbsd.org 2006/08/05 08:00:33 112 - dtucker@cvs.openbsd.org 2006/08/05 08:00:33
113 [auth-skey.c] 113 [auth-skey.c]
114 Add headers required to build with -DSKEY. ok djm@ 114 Add headers required to build with -DSKEY. ok djm@
115 - dtucker@cvs.openbsd.org 2006/08/05 08:28:24
116 [monitor_wrap.c auth-skey.c auth2-chall.c]
117 Zap unused variables in -DSKEY code. ok djm@
115 118
11620060804 11920060804
117 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent 120 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
@@ -5182,4 +5185,4 @@
5182 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5185 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5183 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5186 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5184 5187
5185$Id: ChangeLog,v 1.4467 2006/08/05 08:48:01 dtucker Exp $ 5188$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 @@
1/* $OpenBSD: auth-skey.c,v 1.25 2006/08/05 08:00:33 dtucker Exp $ */ 1/* $OpenBSD: auth-skey.c,v 1.26 2006/08/05 08:28:24 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -51,8 +51,7 @@ skey_query(void *ctx, char **name, char **infotxt,
51 u_int* numprompts, char ***prompts, u_int **echo_on) 51 u_int* numprompts, char ***prompts, u_int **echo_on)
52{ 52{
53 Authctxt *authctxt = ctx; 53 Authctxt *authctxt = ctx;
54 char challenge[1024], *p; 54 char challenge[1024];
55 int len;
56 struct skey skey; 55 struct skey skey;
57 56
58 if (_compat_skeychallenge(&skey, authctxt->user, challenge, 57 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 @@
1/* $OpenBSD: auth2-chall.c,v 1.30 2006/08/03 03:34:41 deraadt Exp $ */ 1/* $OpenBSD: auth2-chall.c,v 1.31 2006/08/05 08:28:24 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * Copyright (c) 2001 Per Allansson. All rights reserved. 4 * 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 @@
1/* $OpenBSD: monitor_wrap.c,v 1.51 2006/08/05 07:52:52 dtucker Exp $ */ 1/* $OpenBSD: monitor_wrap.c,v 1.52 2006/08/05 08:28:24 dtucker Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -941,9 +941,8 @@ mm_skey_query(void *ctx, char **name, char **infotxt,
941 u_int *numprompts, char ***prompts, u_int **echo_on) 941 u_int *numprompts, char ***prompts, u_int **echo_on)
942{ 942{
943 Buffer m; 943 Buffer m;
944 int len;
945 u_int success; 944 u_int success;
946 char *p, *challenge; 945 char *challenge;
947 946
948 debug3("%s: entering", __func__); 947 debug3("%s: entering", __func__);
949 948