diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -96,6 +96,9 @@ | |||
96 | - markus@cvs.openbsd.org 2001/06/27 06:26:36 | 96 | - markus@cvs.openbsd.org 2001/06/27 06:26:36 |
97 | [ssh-add.c] | 97 | [ssh-add.c] |
98 | convert to getopt(3) | 98 | convert to getopt(3) |
99 | - stevesk@cvs.openbsd.org 2001/06/28 19:57:35 | ||
100 | [ssh-keygen.c] | ||
101 | '\0' terminated data[] is ok; ok markus@ | ||
99 | 102 | ||
100 | 20010629 | 103 | 20010629 |
101 | - (bal) Removed net_aton() since we don't use it any more | 104 | - (bal) Removed net_aton() since we don't use it any more |
@@ -5923,4 +5926,4 @@ | |||
5923 | - Wrote replacements for strlcpy and mkdtemp | 5926 | - Wrote replacements for strlcpy and mkdtemp |
5924 | - Released 1.0pre1 | 5927 | - Released 1.0pre1 |
5925 | 5928 | ||
5926 | $Id: ChangeLog,v 1.1366 2001/07/04 05:03:51 mouring Exp $ | 5929 | $Id: ChangeLog,v 1.1367 2001/07/04 05:05:27 mouring Exp $ |
diff --git a/ssh-keygen.c b/ssh-keygen.c index e085c12c8..88b97efe1 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.68 2001/06/27 05:42:25 markus Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.69 2001/06/28 19:57:35 stevesk Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -194,7 +194,7 @@ do_convert_private_ssh2_from_blob(char *blob, int blen) | |||
194 | Buffer b; | 194 | Buffer b; |
195 | Key *key = NULL; | 195 | Key *key = NULL; |
196 | char *type, *cipher; | 196 | char *type, *cipher; |
197 | u_char *sig, data[10] = "abcde12345"; | 197 | u_char *sig, data[] = "abcde12345"; |
198 | int magic, rlen, ktype, i1, i2, i3, i4; | 198 | int magic, rlen, ktype, i1, i2, i3, i4; |
199 | u_int slen; | 199 | u_int slen; |
200 | u_long e; | 200 | u_long e; |