diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2000-05-02 22:18:05 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2000-05-02 22:18:05 +0000 |
| commit | a6c68cea78a64195f2f8e29c2d4f6227293a9e96 (patch) | |
| tree | 1a1213a3631edef5f8fc21fc5f9e885b9963e2ce /usr.bin/ssh | |
| parent | 8aa0a8a6f34e9ba651a3a655111681dc19d9e698 (diff) | |
default DSA key file ~/.ssh/id_dsa
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/readconf.c | 8 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.c | 5 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh.h | 3 |
3 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c index 1e30bc830d4..0271ba99a76 100644 --- a/usr.bin/ssh/readconf.c +++ b/usr.bin/ssh/readconf.c @@ -14,7 +14,7 @@ */ #include "includes.h" -RCSID("$Id: readconf.c,v 1.28 2000/04/26 22:43:14 markus Exp $"); +RCSID("$Id: readconf.c,v 1.29 2000/05/02 22:18:04 markus Exp $"); #include "ssh.h" #include "cipher.h" @@ -745,14 +745,12 @@ fill_default_options(Options * options) sprintf(options->identity_files[0], "~/%.100s", SSH_CLIENT_IDENTITY); options->num_identity_files = 1; } -#if 0 if (options->num_identity_files2 == 0) { options->identity_files2[0] = - xmalloc(2 + strlen(SSH2_CLIENT_IDENTITY) + 1); - sprintf(options->identity_files2[0], "~/%.100s", SSH2_CLIENT_IDENTITY); + xmalloc(2 + strlen(SSH_CLIENT_ID_DSA) + 1); + sprintf(options->identity_files2[0], "~/%.100s", SSH_CLIENT_ID_DSA); options->num_identity_files2 = 1; } -#endif if (options->escape_char == -1) options->escape_char = '~'; if (options->system_hostfile == NULL) diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index 09a178baf4d..f7c5351756f 100644 --- a/usr.bin/ssh/ssh-keygen.c +++ b/usr.bin/ssh/ssh-keygen.c @@ -7,7 +7,7 @@ */ #include "includes.h" -RCSID("$Id: ssh-keygen.c,v 1.22 2000/05/01 08:20:56 hugh Exp $"); +RCSID("$Id: ssh-keygen.c,v 1.23 2000/05/02 22:18:04 markus Exp $"); #include <openssl/evp.h> #include <openssl/pem.h> @@ -72,7 +72,8 @@ ask_filename(struct passwd *pw, const char *prompt) { char buf[1024]; snprintf(identity_file, sizeof(identity_file), "%s/%s", - pw->pw_dir, SSH_CLIENT_IDENTITY); + pw->pw_dir, + dsa_mode ? SSH_CLIENT_ID_DSA: SSH_CLIENT_IDENTITY); printf("%s (%s): ", prompt, identity_file); fflush(stdout); if (fgets(buf, sizeof(buf), stdin) == NULL) diff --git a/usr.bin/ssh/ssh.h b/usr.bin/ssh/ssh.h index 7cb96e5d2a0..fb7085de923 100644 --- a/usr.bin/ssh/ssh.h +++ b/usr.bin/ssh/ssh.h @@ -13,7 +13,7 @@ * */ -/* RCSID("$Id: ssh.h,v 1.41 2000/04/26 22:38:16 deraadt Exp $"); */ +/* RCSID("$Id: ssh.h,v 1.42 2000/05/02 22:18:04 markus Exp $"); */ #ifndef SSH_H #define SSH_H @@ -109,6 +109,7 @@ * file should only be readable by the user him/herself. */ #define SSH_CLIENT_IDENTITY ".ssh/identity" +#define SSH_CLIENT_ID_DSA ".ssh/id_dsa" /* * Configuration file in user\'s home directory. This file need not be |