diff options
author | Damien Miller <djm@mindrot.org> | 2000-07-11 17:31:38 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-07-11 17:31:38 +1000 |
commit | 3702396526a2569402696ff7d7c6d0fe2e5a447b (patch) | |
tree | 3ab056c59cd0c732ec179bd91be88d4e05b087fa /ssh-keygen.c | |
parent | bc33bd44a2ef165dea1d974fc2d80b822ae08c2a (diff) |
- (djm) OpenBSD CVS updates:
- markus@cvs.openbsd.org 2000/06/26 03:22:29
[authfd.c]
cleanup, less cut&paste
- markus@cvs.openbsd.org 2000/06/26 15:59:19
[servconf.c servconf.h session.c sshd.8 sshd.c]
MaxStartups: limit number of unauthenticated connections, work by
theo and me
- deraadt@cvs.openbsd.org 2000/07/05 14:18:07
[session.c]
use no_x11_forwarding_flag correctly; provos ok
- provos@cvs.openbsd.org 2000/07/05 15:35:57
[sshd.c]
typo
- aaron@cvs.openbsd.org 2000/07/05 22:06:58
[scp.1 ssh-agent.1 ssh-keygen.1 sshd.8]
Insert more missing .El directives. Our troff really should identify
these and spit out a warning.
- todd@cvs.openbsd.org 2000/07/06 21:55:04
[auth-rsa.c auth2.c ssh-keygen.c]
clean code is good code
- deraadt@cvs.openbsd.org 2000/07/07 02:14:29
[serverloop.c]
sense of port forwarding flag test was backwards
- provos@cvs.openbsd.org 2000/07/08 17:17:31
[compat.c readconf.c]
replace strtok with strsep; from David Young <dyoung@onthejob.net>
- deraadt@cvs.openbsd.org 2000/07/08 19:21:15
[auth.h]
KNF
- ho@cvs.openbsd.org 2000/07/08 19:27:33
[compat.c readconf.c]
Better conditions for strsep() ending.
- ho@cvs.openbsd.org 2000/07/10 10:27:05
[readconf.c]
Get the correct message on errors. (niels@ ok)
- ho@cvs.openbsd.org 2000/07/10 10:30:25
[cipher.c kex.c servconf.c]
strtok() --> strsep(). (niels@ ok)
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index dbd0443fc..b38ebfb91 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "includes.h" | 9 | #include "includes.h" |
10 | RCSID("$OpenBSD: ssh-keygen.c,v 1.27 2000/06/20 01:39:44 markus Exp $"); | 10 | RCSID("$OpenBSD: ssh-keygen.c,v 1.28 2000/07/07 03:55:04 todd Exp $"); |
11 | 11 | ||
12 | #include <openssl/evp.h> | 12 | #include <openssl/evp.h> |
13 | #include <openssl/pem.h> | 13 | #include <openssl/pem.h> |
@@ -127,13 +127,13 @@ do_convert_to_ssh2(struct passwd *pw) | |||
127 | exit(1); | 127 | exit(1); |
128 | } | 128 | } |
129 | dsa_make_key_blob(k, &blob, &len); | 129 | dsa_make_key_blob(k, &blob, &len); |
130 | fprintf(stdout, SSH_COM_MAGIC_BEGIN "\n"); | 130 | fprintf(stdout, "%s\n", SSH_COM_MAGIC_BEGIN); |
131 | fprintf(stdout, | 131 | fprintf(stdout, |
132 | "Comment: \"%d-bit DSA, converted from openssh by %s@%s\"\n", | 132 | "Comment: \"%d-bit DSA, converted from openssh by %s@%s\"\n", |
133 | BN_num_bits(k->dsa->p), | 133 | BN_num_bits(k->dsa->p), |
134 | pw->pw_name, hostname); | 134 | pw->pw_name, hostname); |
135 | dump_base64(stdout, blob, len); | 135 | dump_base64(stdout, blob, len); |
136 | fprintf(stdout, SSH_COM_MAGIC_END "\n"); | 136 | fprintf(stdout, "%s\n", SSH_COM_MAGIC_END); |
137 | key_free(k); | 137 | key_free(k); |
138 | xfree(blob); | 138 | xfree(blob); |
139 | exit(0); | 139 | exit(0); |