diff options
author | Colin Watson <cjwatson@debian.org> | 2003-09-01 18:42:19 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2003-09-01 18:42:19 +0000 |
commit | 8d6b7f4c46de3feb66f704ab483e51ea1a3bb0e1 (patch) | |
tree | 41fe3dd71501bbec5b0393f1536c925eaee180e9 /key.c | |
parent | f045c69060bfdd5cf8759a5f29d7008d02e4de5b (diff) | |
parent | 58bfa257481a1c6938ada9bbd38801cc45633fb0 (diff) |
Debian release 3.6p1-1.
Diffstat (limited to 'key.c')
-rw-r--r-- | key.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -32,15 +32,13 @@ | |||
32 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 32 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
33 | */ | 33 | */ |
34 | #include "includes.h" | 34 | #include "includes.h" |
35 | RCSID("$OpenBSD: key.c,v 1.49 2002/09/09 14:54:14 markus Exp $"); | 35 | RCSID("$OpenBSD: key.c,v 1.51 2003/02/12 09:33:04 markus Exp $"); |
36 | 36 | ||
37 | #include <openssl/evp.h> | 37 | #include <openssl/evp.h> |
38 | 38 | ||
39 | #include "xmalloc.h" | 39 | #include "xmalloc.h" |
40 | #include "key.h" | 40 | #include "key.h" |
41 | #include "rsa.h" | 41 | #include "rsa.h" |
42 | #include "ssh-dss.h" | ||
43 | #include "ssh-rsa.h" | ||
44 | #include "uuencode.h" | 42 | #include "uuencode.h" |
45 | #include "buffer.h" | 43 | #include "buffer.h" |
46 | #include "bufaux.h" | 44 | #include "bufaux.h" |
@@ -410,14 +408,14 @@ key_read(Key *ret, char **cpp) | |||
410 | case KEY_DSA: | 408 | case KEY_DSA: |
411 | space = strchr(cp, ' '); | 409 | space = strchr(cp, ' '); |
412 | if (space == NULL) { | 410 | if (space == NULL) { |
413 | debug3("key_read: no space"); | 411 | debug3("key_read: missing whitespace"); |
414 | return -1; | 412 | return -1; |
415 | } | 413 | } |
416 | *space = '\0'; | 414 | *space = '\0'; |
417 | type = key_type_from_name(cp); | 415 | type = key_type_from_name(cp); |
418 | *space = ' '; | 416 | *space = ' '; |
419 | if (type == KEY_UNSPEC) { | 417 | if (type == KEY_UNSPEC) { |
420 | debug3("key_read: no key found"); | 418 | debug3("key_read: missing keytype"); |
421 | return -1; | 419 | return -1; |
422 | } | 420 | } |
423 | cp = space+1; | 421 | cp = space+1; |