diff options
| author | Damien Miller <djm@mindrot.org> | 2013-12-07 01:24:01 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-12-07 01:24:01 +0100 |
| commit | 5be9d9e3cbd9c66f24745d25bf2e809c1d158ee0 (patch) | |
| tree | d2086d37436014ea44f0f024396a1a8638640b00 /authfile.c | |
| parent | - markus@cvs.openbsd.org 2013/12/06 13:34:54 (diff) | |
| download | openssh-5be9d9e3cbd9c66f24745d25bf2e809c1d158ee0.tar.xz openssh-5be9d9e3cbd9c66f24745d25bf2e809c1d158ee0.zip | |
- markus@cvs.openbsd.org 2013/12/06 13:39:49
[authfd.c authfile.c key.c key.h myproposal.h pathnames.h readconf.c]
[servconf.c ssh-agent.c ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c]
[ssh-keysign.c ssh.c ssh_config.5 sshd.8 sshd.c verify.c ssh-ed25519.c]
[sc25519.h sc25519.c hash.c ge25519_base.data ge25519.h ge25519.c]
[fe25519.h fe25519.c ed25519.c crypto_api.h blocks.c]
support ed25519 keys (hostkeys and user identities) using the public
domain ed25519 reference code from SUPERCOP, see
http://ed25519.cr.yp.to/software.html
feedback, help & ok djm@
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 @@ -/* $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 @@ -50,6 +50,8 @@ /* compatibility with old or broken OpenSSL versions */ #include "openbsd-compat/openssl-compat.h" +#include "crypto_api.h" + #include <errno.h> #include <fcntl.h> #include <stdarg.h> @@ -593,6 +595,9 @@ key_private_to_blob(Key *key, Buffer *blob, const char *passphrase, 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; @@ -997,6 +1002,9 @@ key_parse_private_type(Buffer *blob, int type, const char *passphrase, 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; |