summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/ssh/ssh-agent.c10
-rw-r--r--usr.bin/ssh/ssh-keygen.c10
-rw-r--r--usr.bin/ssh/ssh.c10
3 files changed, 15 insertions, 15 deletions
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c
index 30330670abb..8c9970c15e0 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.69 2001/08/01 22:03:33 markus Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.70 2001/08/02 15:43:57 jakob Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -36,7 +36,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.69 2001/08/01 22:03:33 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.70 2001/08/02 15:43:57 jakob Exp $");
#include <openssl/evp.h>
#include <openssl/md5.h>
@@ -59,7 +59,7 @@ RCSID("$OpenBSD: ssh-agent.c,v 1.69 2001/08/01 22:03:33 markus Exp $");
#ifdef SMARTCARD
#include <openssl/engine.h>
#include "scard.h"
-#endif
+#endif /* SMARTCARD */
typedef struct {
int fd;
@@ -545,7 +545,7 @@ process_remove_smartcard_key(SocketEntry *e)
buffer_put_char(&e->output,
success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
}
-#endif
+#endif /* SMARTCARD */
/* dispatch incoming messages */
@@ -611,7 +611,7 @@ process_message(SocketEntry *e)
case SSH_AGENTC_REMOVE_SMARTCARD_KEY:
process_remove_smartcard_key(e);
break;
-#endif
+#endif /* SMARTCARD */
default:
/* Unknown message. Respond with failure. */
error("Unknown message %d", type);
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index a4d834f6e91..ed2ed577615 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.77 2001/08/02 15:06:52 jakob Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.78 2001/08/02 15:43:57 jakob Exp $");
#include <openssl/evp.h>
#include <openssl/pem.h>
@@ -32,7 +32,7 @@ RCSID("$OpenBSD: ssh-keygen.c,v 1.77 2001/08/02 15:06:52 jakob Exp $");
#include <sectok.h>
#include <openssl/engine.h>
#include "scard.h"
-#endif
+#endif /* SMARTCARD */
/* Number of bits in the RSA/DSA key. This value can be changed on the command line. */
int bits = 1024;
@@ -511,7 +511,7 @@ do_download(struct passwd *pw, const char *sc_reader_id)
fprintf(stdout, "\n");
exit(0);
}
-#endif
+#endif /* SMARTCARD */
static void
do_fingerprint(struct passwd *pw)
@@ -938,9 +938,9 @@ main(int ac, char **av)
do_download(pw, reader_id);
else
do_upload(pw, reader_id);
-#else
+#else /* SMARTCARD */
fatal("no support for smartcards.");
-#endif
+#endif /* SMARTCARD */
}
arc4random_stir();
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index b99a67e18cd..a71d2c28502 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.135 2001/08/02 15:32:10 jakob Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.136 2001/08/02 15:43:57 jakob Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -72,7 +72,7 @@ RCSID("$OpenBSD: ssh.c,v 1.135 2001/08/02 15:32:10 jakob Exp $");
#ifdef SMARTCARD
#include <openssl/engine.h>
#include "scard.h"
-#endif
+#endif /* SMARTCARD */
extern char *__progname;
@@ -359,9 +359,9 @@ again:
case 'I':
#ifdef SMARTCARD
options.smartcard_device = xstrdup(optarg);
-#else
+#else /* SMARTCARD */
fprintf(stderr, "no support for smartcards.\n");
-#endif
+#endif /* SMARTCARD */
break;
case 't':
if (tty_flag)
@@ -1171,7 +1171,7 @@ load_public_identity_files(void)
key_free(public);
}
-#endif
+#endif /* SMARTCARD */
for (; i < options.num_identity_files; i++) {
filename = tilde_expand_filename(options.identity_files[i],
original_real_uid);