summaryrefslogtreecommitdiff
path: root/ssh-agent.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-08-06 21:57:31 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-08-06 21:57:31 +0000
commitffce1476383e513c252452d444d17af59c14ef2c (patch)
tree3db1f9722242be49dcd9c23ad706b31902d92f9e /ssh-agent.c
parent61eb9568b32a0c0d57808f9b7d12231d99220636 (diff)
- 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@
Diffstat (limited to 'ssh-agent.c')
-rw-r--r--ssh-agent.c10
1 files changed, 5 insertions, 5 deletions
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);