RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-02-26 10:51:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- jakob@cvs.openbsd.org 2001/08/02 15:43:57

Browse Source 
[ssh-agent.c ssh.c ssh-keygen.c]
     add /* SMARTCARD */ to #else/#endif. ok markus@
This commit is contained in:
Ben Lindstrom 2001-08-06 21:57:31 +00:00
parent 61eb9568b3
commit ffce147638
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -119,6 +119,9 @@
- jakob@cvs.openbsd.org 2001/08/02 15:32:10
[ssh.c]
add smartcard to usage(). ok markus@
- 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@
20010803
- (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
@ -6229,4 +6232,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
$Id: ChangeLog,v 1.1457 2001/08/06 21:53:42 mouring Exp $
$Id: ChangeLog,v 1.1458 2001/08/06 21:57:31 mouring Exp $

10
ssh-agent.c
View File

@ -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;
@ -549,7 +549,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 */
@ -615,7 +615,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);

10
ssh-keygen.c
View File

@ -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;
@ -515,7 +515,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)
@ -946,9 +946,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();

10
ssh.c
View File

@ -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 */
#ifdef HAVE___PROGNAME
extern char *__progname;
@ -376,9 +376,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)
@ -1195,7 +1195,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);