diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-01-20 22:57:10 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-01-20 22:57:10 +0000 |
| commit | eccfee6ebc28c335f2a2b9db7736dc1961131b04 (patch) | |
| tree | c90d6531b4082060e49583793ca124b381f7ffd6 /crypto/openssh/authfile.c | |
| parent | bd3f34d4ba691b1bbc79269f992c5ae666b9404e (diff) | |
| parent | d994eeedda788efc28b630e10a33548453293473 (diff) | |
| download | src-eccfee6ebc28c335f2a2b9db7736dc1961131b04.tar.gz src-eccfee6ebc28c335f2a2b9db7736dc1961131b04.zip | |
Upgrade to OpenSSH 7.0p1.
Notes
Notes:
svn path=/head/; revision=294464
Diffstat (limited to 'crypto/openssh/authfile.c')
| -rw-r--r-- | crypto/openssh/authfile.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/openssh/authfile.c b/crypto/openssh/authfile.c index 728b136a77bd..58f589a4745d 100644 --- a/crypto/openssh/authfile.c +++ b/crypto/openssh/authfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfile.c,v 1.114 2015/04/17 13:32:09 djm Exp $ */ +/* $OpenBSD: authfile.c,v 1.116 2015/07/09 09:49:46 markus Exp $ */ /* * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. * @@ -39,13 +39,13 @@ #include <limits.h> #include "cipher.h" -#include "key.h" #include "ssh.h" #include "log.h" #include "authfile.h" #include "rsa.h" #include "misc.h" #include "atomicio.h" +#include "sshkey.h" #include "sshbuf.h" #include "ssherr.h" #include "krl.h" @@ -448,8 +448,8 @@ sshkey_load_private_cert(int type, const char *filename, const char *passphrase, case KEY_RSA: case KEY_DSA: case KEY_ECDSA: - case KEY_ED25519: #endif /* WITH_OPENSSL */ + case KEY_ED25519: case KEY_UNSPEC: break; default: @@ -467,7 +467,7 @@ sshkey_load_private_cert(int type, const char *filename, const char *passphrase, goto out; } - if ((r = sshkey_to_certified(key, sshkey_cert_is_legacy(cert))) != 0 || + if ((r = sshkey_to_certified(key)) != 0 || (r = sshkey_cert_copy(cert, key)) != 0) goto out; r = 0; |