diff options
Diffstat (limited to 'authfile.c')
-rw-r--r-- | authfile.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/authfile.c b/authfile.c index e38a3dd14..b0fc23e6a 100644 --- a/authfile.c +++ b/authfile.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: authfile.c,v 1.99 2013/12/06 13:34:54 markus Exp $ */ | 1 | /* $OpenBSD: authfile.c,v 1.100 2013/12/06 13:39:49 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -50,6 +50,8 @@ | |||
50 | /* compatibility with old or broken OpenSSL versions */ | 50 | /* compatibility with old or broken OpenSSL versions */ |
51 | #include "openbsd-compat/openssl-compat.h" | 51 | #include "openbsd-compat/openssl-compat.h" |
52 | 52 | ||
53 | #include "crypto_api.h" | ||
54 | |||
53 | #include <errno.h> | 55 | #include <errno.h> |
54 | #include <fcntl.h> | 56 | #include <fcntl.h> |
55 | #include <stdarg.h> | 57 | #include <stdarg.h> |
@@ -593,6 +595,9 @@ key_private_to_blob(Key *key, Buffer *blob, const char *passphrase, | |||
593 | comment, new_format_cipher, new_format_rounds); | 595 | comment, new_format_cipher, new_format_rounds); |
594 | } | 596 | } |
595 | return key_private_pem_to_blob(key, blob, passphrase, comment); | 597 | return key_private_pem_to_blob(key, blob, passphrase, comment); |
598 | case KEY_ED25519: | ||
599 | return key_private_to_blob2(key, blob, passphrase, | ||
600 | comment, new_format_cipher, new_format_rounds); | ||
596 | default: | 601 | default: |
597 | error("%s: cannot save key type %d", __func__, key->type); | 602 | error("%s: cannot save key type %d", __func__, key->type); |
598 | return 0; | 603 | return 0; |
@@ -997,6 +1002,9 @@ key_parse_private_type(Buffer *blob, int type, const char *passphrase, | |||
997 | case KEY_DSA: | 1002 | case KEY_DSA: |
998 | case KEY_ECDSA: | 1003 | case KEY_ECDSA: |
999 | case KEY_RSA: | 1004 | case KEY_RSA: |
1005 | return key_parse_private_pem(blob, type, passphrase, commentp); | ||
1006 | case KEY_ED25519: | ||
1007 | return key_parse_private2(blob, type, passphrase, commentp); | ||
1000 | case KEY_UNSPEC: | 1008 | case KEY_UNSPEC: |
1001 | if ((k = key_parse_private2(blob, type, passphrase, commentp))) | 1009 | if ((k = key_parse_private2(blob, type, passphrase, commentp))) |
1002 | return k; | 1010 | return k; |