- jakob@cvs.openbsd.org 2001/08/02 16:14:05

     [scard.c ssh-agent.c ssh.c ssh-keygen.c]
     clean up some /* SMARTCARD */. ok markus@

diff --git a/ChangeLog b/ChangeLog
index c50ddb8af0f555d38b9741dbad5aef4f963b7be6..21b21a6a7035647fd0454d9f032483adf1625897 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -122,6 +122,9 @@
    - jakob@cvs.openbsd.org 2001/08/02 15:43:57
      [ssh-agent.c ssh.c ssh-keygen.c]
      add /* SMARTCARD */ to #else/#endif. ok markus@
+  - jakob@cvs.openbsd.org 2001/08/02 16:14:05
+     [scard.c ssh-agent.c ssh.c ssh-keygen.c]
+     clean up some /* SMARTCARD */. ok markus@
 
 20010803
  - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on

diff --git a/scard.c b/scard.c
index cfcd953bd95126d92fa030205ea21c6331ce8e10..6e6de2f329501a9cb7c5997b32bc0dba7b1bfc8b 100644 (file)
--- a/scard.c
+++ b/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/ssh-agent.c b/ssh-agent.c
index a396fe0350226537ee4b0d508a3e0d85e3e9227e..3e8eb06017030c2cbc7b456f9235c5c4d8e1c175 100644 (file)
--- a/ssh-agent.c
+++ b/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/ssh-keygen.c b/ssh-keygen.c
index 6e71ac707621907bda96396b23879b0dc5f21b5e..cd1674b04c2dfd020373819037e7a8e5c3edb102 100644 (file)
--- a/ssh-keygen.c
+++ b/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/ssh.c b/ssh.c
index ee3f0c6a01efc0c7431bcfdde53b6b8fddd816e0..e2d2c16bd265bb00c32e4748abeaaed929ae344d 100644 (file)
--- a/ssh.c
+++ b/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
 
 #ifdef HAVE___PROGNAME
 extern char *__progname;
@@ -171,7 +171,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");
@@ -376,9 +376,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)