summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-agent.c10
-rw-r--r--ssh-keygen.c10
-rw-r--r--ssh.c10
4 files changed, 19 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 4913669d8..4a56e9cda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -119,6 +119,9 @@
119 - jakob@cvs.openbsd.org 2001/08/02 15:32:10 119 - jakob@cvs.openbsd.org 2001/08/02 15:32:10
120 [ssh.c] 120 [ssh.c]
121 add smartcard to usage(). ok markus@ 121 add smartcard to usage(). ok markus@
122 - jakob@cvs.openbsd.org 2001/08/02 15:43:57
123 [ssh-agent.c ssh.c ssh-keygen.c]
124 add /* SMARTCARD */ to #else/#endif. ok markus@
122 125
12320010803 12620010803
124 - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on 127 - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
@@ -6229,4 +6232,4 @@
6229 - Wrote replacements for strlcpy and mkdtemp 6232 - Wrote replacements for strlcpy and mkdtemp
6230 - Released 1.0pre1 6233 - Released 1.0pre1
6231 6234
6232$Id: ChangeLog,v 1.1457 2001/08/06 21:53:42 mouring Exp $ 6235$Id: ChangeLog,v 1.1458 2001/08/06 21:57:31 mouring Exp $
diff --git a/ssh-agent.c b/ssh-agent.c
index 1df3ccd11..a396fe035 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.69 2001/08/01 22:03:33 markus Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.70 2001/08/02 15:43:57 jakob Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -36,7 +36,7 @@
36 */ 36 */
37 37
38#include "includes.h" 38#include "includes.h"
39RCSID("$OpenBSD: ssh-agent.c,v 1.69 2001/08/01 22:03:33 markus Exp $"); 39RCSID("$OpenBSD: ssh-agent.c,v 1.70 2001/08/02 15:43:57 jakob Exp $");
40 40
41#include <openssl/evp.h> 41#include <openssl/evp.h>
42#include <openssl/md5.h> 42#include <openssl/md5.h>
@@ -59,7 +59,7 @@ RCSID("$OpenBSD: ssh-agent.c,v 1.69 2001/08/01 22:03:33 markus Exp $");
59#ifdef SMARTCARD 59#ifdef SMARTCARD
60#include <openssl/engine.h> 60#include <openssl/engine.h>
61#include "scard.h" 61#include "scard.h"
62#endif 62#endif /* SMARTCARD */
63 63
64typedef struct { 64typedef struct {
65 int fd; 65 int fd;
@@ -549,7 +549,7 @@ process_remove_smartcard_key(SocketEntry *e)
549 buffer_put_char(&e->output, 549 buffer_put_char(&e->output,
550 success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE); 550 success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
551} 551}
552#endif 552#endif /* SMARTCARD */
553 553
554/* dispatch incoming messages */ 554/* dispatch incoming messages */
555 555
@@ -615,7 +615,7 @@ process_message(SocketEntry *e)
615 case SSH_AGENTC_REMOVE_SMARTCARD_KEY: 615 case SSH_AGENTC_REMOVE_SMARTCARD_KEY:
616 process_remove_smartcard_key(e); 616 process_remove_smartcard_key(e);
617 break; 617 break;
618#endif 618#endif /* SMARTCARD */
619 default: 619 default:
620 /* Unknown message. Respond with failure. */ 620 /* Unknown message. Respond with failure. */
621 error("Unknown message %d", type); 621 error("Unknown message %d", type);
diff --git a/ssh-keygen.c b/ssh-keygen.c
index faa27d219..6e71ac707 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: ssh-keygen.c,v 1.77 2001/08/02 15:06:52 jakob Exp $"); 15RCSID("$OpenBSD: ssh-keygen.c,v 1.78 2001/08/02 15:43:57 jakob Exp $");
16 16
17#include <openssl/evp.h> 17#include <openssl/evp.h>
18#include <openssl/pem.h> 18#include <openssl/pem.h>
@@ -32,7 +32,7 @@ RCSID("$OpenBSD: ssh-keygen.c,v 1.77 2001/08/02 15:06:52 jakob Exp $");
32#include <sectok.h> 32#include <sectok.h>
33#include <openssl/engine.h> 33#include <openssl/engine.h>
34#include "scard.h" 34#include "scard.h"
35#endif 35#endif /* SMARTCARD */
36 36
37/* Number of bits in the RSA/DSA key. This value can be changed on the command line. */ 37/* Number of bits in the RSA/DSA key. This value can be changed on the command line. */
38int bits = 1024; 38int bits = 1024;
@@ -515,7 +515,7 @@ do_download(struct passwd *pw, const char *sc_reader_id)
515 fprintf(stdout, "\n"); 515 fprintf(stdout, "\n");
516 exit(0); 516 exit(0);
517} 517}
518#endif 518#endif /* SMARTCARD */
519 519
520static void 520static void
521do_fingerprint(struct passwd *pw) 521do_fingerprint(struct passwd *pw)
@@ -946,9 +946,9 @@ main(int ac, char **av)
946 do_download(pw, reader_id); 946 do_download(pw, reader_id);
947 else 947 else
948 do_upload(pw, reader_id); 948 do_upload(pw, reader_id);
949#else 949#else /* SMARTCARD */
950 fatal("no support for smartcards."); 950 fatal("no support for smartcards.");
951#endif 951#endif /* SMARTCARD */
952 } 952 }
953 953
954 arc4random_stir(); 954 arc4random_stir();
diff --git a/ssh.c b/ssh.c
index 501a4a27b..ee3f0c6a0 100644
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
39 */ 39 */
40 40
41#include "includes.h" 41#include "includes.h"
42RCSID("$OpenBSD: ssh.c,v 1.135 2001/08/02 15:32:10 jakob Exp $"); 42RCSID("$OpenBSD: ssh.c,v 1.136 2001/08/02 15:43:57 jakob Exp $");
43 43
44#include <openssl/evp.h> 44#include <openssl/evp.h>
45#include <openssl/err.h> 45#include <openssl/err.h>
@@ -72,7 +72,7 @@ RCSID("$OpenBSD: ssh.c,v 1.135 2001/08/02 15:32:10 jakob Exp $");
72#ifdef SMARTCARD 72#ifdef SMARTCARD
73#include <openssl/engine.h> 73#include <openssl/engine.h>
74#include "scard.h" 74#include "scard.h"
75#endif 75#endif /* SMARTCARD */
76 76
77#ifdef HAVE___PROGNAME 77#ifdef HAVE___PROGNAME
78extern char *__progname; 78extern char *__progname;
@@ -376,9 +376,9 @@ again:
376 case 'I': 376 case 'I':
377#ifdef SMARTCARD 377#ifdef SMARTCARD
378 options.smartcard_device = xstrdup(optarg); 378 options.smartcard_device = xstrdup(optarg);
379#else 379#else /* SMARTCARD */
380 fprintf(stderr, "no support for smartcards.\n"); 380 fprintf(stderr, "no support for smartcards.\n");
381#endif 381#endif /* SMARTCARD */
382 break; 382 break;
383 case 't': 383 case 't':
384 if (tty_flag) 384 if (tty_flag)
@@ -1195,7 +1195,7 @@ load_public_identity_files(void)
1195 1195
1196 key_free(public); 1196 key_free(public);
1197 } 1197 }
1198#endif 1198#endif /* SMARTCARD */
1199 for (; i < options.num_identity_files; i++) { 1199 for (; i < options.num_identity_files; i++) {
1200 filename = tilde_expand_filename(options.identity_files[i], 1200 filename = tilde_expand_filename(options.identity_files[i],
1201 original_real_uid); 1201 original_real_uid);