mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-27 14:44:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[scard.c ssh-agent.c ssh.c ssh-keygen.c]
     clean up some /* SMARTCARD */. ok markus@
This commit is contained in:
Ben Lindstrom 2001-08-06 21:59:25 +00:00
parent ffce147638
commit bcc1808bf2
5 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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
@ -6232,4 +6235,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
$Id: ChangeLog,v 1.1458 2001/08/06 21:57:31 mouring Exp $
$Id: ChangeLog,v 1.1459 2001/08/06 21:59:25 mouring Exp $

4
scard.c
View File

@ -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 */

6
ssh-agent.c
View File

@ -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;

4
ssh-keygen.c
View File

@ -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;

10
ssh.c
View File

@ -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)