diff options
author | Damien Miller <djm@mindrot.org> | 2000-11-29 12:18:44 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-11-29 12:18:44 +1100 |
commit | e39cacc5793b19e74319b3c33c5e3b9fed0c18ff (patch) | |
tree | fdfe9c87a8fb716af0d235105e04580a24261011 /ssh.h | |
parent | 3f62abaee876bb4ef7450799cdee1081297aae51 (diff) |
- (djm) OpenBSD CVS updates:
- provos@cvs.openbsd.org 2000/11/22 08:38:31
[sshd.8]
talk about /etc/primes, okay markus@
- markus@cvs.openbsd.org 2000/11/23 14:03:48
[ssh.c sshconnect1.c sshconnect2.c]
complain about invalid ciphers for ssh1/ssh2, fall back to reasonable
defaults
- markus@cvs.openbsd.org 2000/11/25 09:42:53
[sshconnect1.c]
reorder check for illegal ciphers, bugreport from espie@
- markus@cvs.openbsd.org 2000/11/25 10:19:34
[ssh-keygen.c ssh.h]
print keytype when generating a key.
reasonable defaults for RSA1/RSA/DSA keys.
Diffstat (limited to 'ssh.h')
-rw-r--r-- | ssh.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -12,7 +12,7 @@ | |||
12 | * called by a name other than "ssh" or "Secure Shell". | 12 | * called by a name other than "ssh" or "Secure Shell". |
13 | */ | 13 | */ |
14 | 14 | ||
15 | /* RCSID("$OpenBSD: ssh.h,v 1.54 2000/10/11 20:27:24 markus Exp $"); */ | 15 | /* RCSID("$OpenBSD: ssh.h,v 1.55 2000/11/25 17:19:33 markus Exp $"); */ |
16 | 16 | ||
17 | #ifndef SSH_H | 17 | #ifndef SSH_H |
18 | #define SSH_H | 18 | #define SSH_H |
@@ -144,6 +144,7 @@ | |||
144 | */ | 144 | */ |
145 | #define SSH_CLIENT_IDENTITY ".ssh/identity" | 145 | #define SSH_CLIENT_IDENTITY ".ssh/identity" |
146 | #define SSH_CLIENT_ID_DSA ".ssh/id_dsa" | 146 | #define SSH_CLIENT_ID_DSA ".ssh/id_dsa" |
147 | #define SSH_CLIENT_ID_RSA ".ssh/id_rsa" | ||
147 | 148 | ||
148 | /* | 149 | /* |
149 | * Configuration file in user\'s home directory. This file need not be | 150 | * Configuration file in user\'s home directory. This file need not be |