diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2006-08-05 08:28:25 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2006-08-05 08:28:25 +0000 |
| commit | f994e9c321483432c55badd1a3b2229df54101ca (patch) | |
| tree | 20975b59b0bfcc948c90e787f12bc82e2388aa1f /usr.bin/ssh | |
| parent | 7d093c4abf9178bf052125698e2d1ec063af9c7d (diff) | |
Zap unused variables in -DSKEY code. ok djm@
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/auth-skey.c | 5 | ||||
| -rw-r--r-- | usr.bin/ssh/auth2-chall.c | 5 | ||||
| -rw-r--r-- | usr.bin/ssh/monitor_wrap.c | 5 |
3 files changed, 7 insertions, 8 deletions
diff --git a/usr.bin/ssh/auth-skey.c b/usr.bin/ssh/auth-skey.c index 2e8e4bb4915..ab1eab6db33 100644 --- a/usr.bin/ssh/auth-skey.c +++ b/usr.bin/ssh/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. * @@ -49,8 +49,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 (skeychallenge(&skey, authctxt->user, challenge) == -1) diff --git a/usr.bin/ssh/auth2-chall.c b/usr.bin/ssh/auth2-chall.c index 8f0b6517d2f..b1f09e68718 100644 --- a/usr.bin/ssh/auth2-chall.c +++ b/usr.bin/ssh/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. @@ -321,10 +321,11 @@ privsep_challenge_enable(void) { #ifdef BSD_AUTH extern KbdintDevice mm_bsdauth_device; -#endif +#else #ifdef SKEY extern KbdintDevice mm_skey_device; #endif +#endif /* As long as SSHv1 has devices[0] hard coded this is fine */ #ifdef BSD_AUTH devices[0] = &mm_bsdauth_device; diff --git a/usr.bin/ssh/monitor_wrap.c b/usr.bin/ssh/monitor_wrap.c index a44776b2b04..a27e7fcc839 100644 --- a/usr.bin/ssh/monitor_wrap.c +++ b/usr.bin/ssh/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> @@ -797,9 +797,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__); |