diff options
| author | djm <djm> | 2003-05-14 03:45:22 +0000 |
|---|---|---|
| committer | djm <djm> | 2003-05-14 03:45:22 +0000 |
| commit | c65cbbe2f9683cc84a3f6fe5a6e96175a50768b4 (patch) | |
| tree | 2db5dd9a306466a5eadca9246b6c8f487086376b /ssh-keygen.c | |
| parent | 34086920780cbde4419a3fe2b7b51eea827a53ce (diff) | |
| download | openssh-c65cbbe2f9683cc84a3f6fe5a6e96175a50768b4.tar.gz | |
- markus@cvs.openbsd.org 2003/05/11 16:56:48
[authfile.c ssh-keygen.c]
change key_load_public to try to read a public from:
rsa1 private or rsa1 public and ssh2 keys.
this makes ssh-keygen -e fail for ssh1 keys more gracefully
for example; report from itojun (netbsd pr 20550).
Diffstat (limited to 'ssh-keygen.c')
| -rw-r--r-- | ssh-keygen.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 4bd79af6..1d08c7ce 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.103 2003/04/08 20:21:29 itojun Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.104 2003/05/11 16:56:48 markus Exp $"); #include <openssl/evp.h> #include <openssl/pem.h> @@ -163,6 +163,10 @@ do_convert_to_ssh2(struct passwd *pw) exit(1); } } + if (k->type == KEY_RSA1) { + fprintf(stderr, "version 1 keys are not supported\n"); + exit(1); + } if (key_to_blob(k, &blob, &len) <= 0) { fprintf(stderr, "key_to_blob failed\n"); exit(1); |