diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-01-19 16:18:26 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2016-01-19 16:18:26 +0000 |
| commit | a0ee8cc636cd5c2374ec44ca71226564ea0bca95 (patch) | |
| tree | bc48bd740145eea64393ed391fc1d972c83f991c /crypto/openssh/dns.c | |
| parent | e936121d3140af047a498559493b9375a6ba6ba3 (diff) | |
| parent | c0bbca73c6f7f15d5401332151fc9f9755abaf8f (diff) | |
| download | src-a0ee8cc636cd5c2374ec44ca71226564ea0bca95.tar.gz src-a0ee8cc636cd5c2374ec44ca71226564ea0bca95.zip | |
Upgrade to OpenSSH 6.7p1, retaining libwrap support (which has been removed
upstream) and a number of security fixes which we had already backported.
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=294328
Diffstat (limited to 'crypto/openssh/dns.c')
| -rw-r--r-- | crypto/openssh/dns.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/crypto/openssh/dns.c b/crypto/openssh/dns.c index 630b97ae84dc..c4d073cf50fa 100644 --- a/crypto/openssh/dns.c +++ b/crypto/openssh/dns.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dns.c,v 1.29 2013/05/17 00:13:13 djm Exp $ */ +/* $OpenBSD: dns.c,v 1.31 2014/06/24 01:13:21 djm Exp $ */ /* * Copyright (c) 2003 Wesley Griffin. All rights reserved. @@ -34,6 +34,8 @@ #include <stdarg.h> #include <stdio.h> #include <string.h> +#include <stdarg.h> +#include <stdlib.h> #include "xmalloc.h" #include "key.h" @@ -96,6 +98,11 @@ dns_read_key(u_int8_t *algorithm, u_int8_t *digest_type, if (!*digest_type) *digest_type = SSHFP_HASH_SHA256; break; + case KEY_ED25519: + *algorithm = SSHFP_KEY_ED25519; + if (!*digest_type) + *digest_type = SSHFP_HASH_SHA256; + break; default: *algorithm = SSHFP_KEY_RESERVED; /* 0 */ *digest_type = SSHFP_HASH_RESERVED; /* 0 */ |