===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/authfile.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- src/usr.bin/ssh/authfile.c	2013/12/06 13:34:54	1.99
+++ src/usr.bin/ssh/authfile.c	2013/12/06 13:39:49	1.100
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfile.c,v 1.99 2013/12/06 13:34:54 markus Exp $ */
+/* $OpenBSD: authfile.c,v 1.100 2013/12/06 13:39:49 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -46,6 +46,8 @@
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 
+#include "crypto_api.h"
+
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -582,6 +584,9 @@
 			    comment, new_format_cipher, new_format_rounds);
 		}
 		return key_private_pem_to_blob(key, blob, passphrase, comment);
+	case KEY_ED25519:
+		return key_private_to_blob2(key, blob, passphrase,
+		    comment, new_format_cipher, new_format_rounds);
 	default:
 		error("%s: cannot save key type %d", __func__, key->type);
 		return 0;
@@ -981,6 +986,9 @@
 	case KEY_DSA:
 	case KEY_ECDSA:
 	case KEY_RSA:
+		return key_parse_private_pem(blob, type, passphrase, commentp);
+	case KEY_ED25519:
+		return key_parse_private2(blob, type, passphrase, commentp);
 	case KEY_UNSPEC:
 		if ((k = key_parse_private2(blob, type, passphrase, commentp)))
 			return k;