diff options
| author | Jakob Schlyter <jakob@cvs.openbsd.org> | 2001-08-02 16:14:06 +0000 |
|---|---|---|
| committer | Jakob Schlyter <jakob@cvs.openbsd.org> | 2001-08-02 16:14:06 +0000 |
| commit | 0cef5d85c6f165e459fb510ef3803d00709ea915 (patch) | |
| tree | 667f6fab2c3ee7ab2b6880bcc43955bd32348f42 /usr.bin | |
| parent | 92e7cec78804f4656b2778be0beba592d2f7011e (diff) | |
clean up some /* SMARTCARD */. ok markus@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/scard.c | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh-agent.c | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.c | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh.c | 10 |
4 files changed, 12 insertions, 12 deletions
diff --git a/usr.bin/ssh/scard.c b/usr.bin/ssh/scard.c index cfcd953bd95..6e6de2f3295 100644 --- a/usr.bin/ssh/scard.c +++ b/usr.bin/ssh/scard.c @@ -24,7 +24,7 @@ #ifdef SMARTCARD #include "includes.h" -RCSID("$OpenBSD: scard.c,v 1.12 2001/08/01 23:38:45 markus Exp $"); +RCSID("$OpenBSD: scard.c,v 1.13 2001/08/02 16:14:05 jakob Exp $"); #include <openssl/engine.h> #include <sectok.h> @@ -369,4 +369,4 @@ sc_get_key(const char *id) return k; sc_close(); } -#endif +#endif /* SMARTCARD */ diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c index 8c9970c15e0..78c901948cc 100644 --- a/usr.bin/ssh/ssh-agent.c +++ b/usr.bin/ssh/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.70 2001/08/02 15:43:57 jakob Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.71 2001/08/02 16:14:05 jakob Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -36,7 +36,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-agent.c,v 1.70 2001/08/02 15:43:57 jakob Exp $"); +RCSID("$OpenBSD: ssh-agent.c,v 1.71 2001/08/02 16:14:05 jakob Exp $"); #include <openssl/evp.h> #include <openssl/md5.h> @@ -59,7 +59,7 @@ RCSID("$OpenBSD: ssh-agent.c,v 1.70 2001/08/02 15:43:57 jakob Exp $"); #ifdef SMARTCARD #include <openssl/engine.h> #include "scard.h" -#endif /* SMARTCARD */ +#endif typedef struct { int fd; diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index ed2ed577615..d831b539a50 100644 --- a/usr.bin/ssh/ssh-keygen.c +++ b/usr.bin/ssh/ssh-keygen.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.78 2001/08/02 15:43:57 jakob Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.79 2001/08/02 16:14:05 jakob Exp $"); #include <openssl/evp.h> #include <openssl/pem.h> @@ -32,7 +32,7 @@ RCSID("$OpenBSD: ssh-keygen.c,v 1.78 2001/08/02 15:43:57 jakob Exp $"); #include <sectok.h> #include <openssl/engine.h> #include "scard.h" -#endif /* SMARTCARD */ +#endif /* Number of bits in the RSA/DSA key. This value can be changed on the command line. */ int bits = 1024; diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index a71d2c28502..f0016c7b5e8 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.136 2001/08/02 15:43:57 jakob Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.137 2001/08/02 16:14:05 jakob Exp $"); #include <openssl/evp.h> #include <openssl/err.h> @@ -72,7 +72,7 @@ RCSID("$OpenBSD: ssh.c,v 1.136 2001/08/02 15:43:57 jakob Exp $"); #ifdef SMARTCARD #include <openssl/engine.h> #include "scard.h" -#endif /* SMARTCARD */ +#endif extern char *__progname; @@ -163,7 +163,7 @@ usage(void) "(default: ~/.ssh/identity)\n"); #ifdef SMARTCARD fprintf(stderr, " -I reader Set smartcard reader.\n"); -#endif /* SMARTCARD */ +#endif fprintf(stderr, " -t Tty; allocate a tty even if command is given.\n"); fprintf(stderr, " -T Do not allocate a tty.\n"); fprintf(stderr, " -v Verbose; display verbose debugging messages.\n"); @@ -359,9 +359,9 @@ again: case 'I': #ifdef SMARTCARD options.smartcard_device = xstrdup(optarg); -#else /* SMARTCARD */ +#else fprintf(stderr, "no support for smartcards.\n"); -#endif /* SMARTCARD */ +#endif break; case 't': if (tty_flag) |