- logan@cvs.openbsd.org 2014/04/20 09:24:26
[dns.c dns.h ssh-keygen.c]
Add support for SSHFP DNS records for ED25519 key types.
OK from djm@
diff --git a/ChangeLog b/ChangeLog
index 909d0e1..ff9c3cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
20140519
- (djm) [rijndael.c rijndael.h] Sync with newly-ressurected versions ine
OpenBSD
+ - OpenBSD CVS Sync
+ - logan@cvs.openbsd.org 2014/04/20 09:24:26
+ [dns.c dns.h ssh-keygen.c]
+ Add support for SSHFP DNS records for ED25519 key types.
+ OK from djm@
20140430
- (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already
diff --git a/dns.c b/dns.c
index 630b97a..c780f8b 100644
--- a/dns.c
+++ b/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.30 2014/04/20 09:24:26 logan Exp $ */
/*
* Copyright (c) 2003 Wesley Griffin. All rights reserved.
@@ -96,6 +96,11 @@
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 */
diff --git a/dns.h b/dns.h
index d5f4281..b9feae6 100644
--- a/dns.h
+++ b/dns.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dns.h,v 1.12 2012/05/23 03:28:28 djm Exp $ */
+/* $OpenBSD: dns.h,v 1.13 2014/04/20 09:24:26 logan Exp $ */
/*
* Copyright (c) 2003 Wesley Griffin. All rights reserved.
@@ -32,7 +32,8 @@
SSHFP_KEY_RESERVED = 0,
SSHFP_KEY_RSA = 1,
SSHFP_KEY_DSA = 2,
- SSHFP_KEY_ECDSA = 3
+ SSHFP_KEY_ECDSA = 3,
+ SSHFP_KEY_ED25519 = 4
};
enum sshfp_hashes {
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 75dea31..d37b7f7 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.243 2014/03/15 17:28:26 deraadt Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.244 2014/04/20 09:24:26 logan Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2498,7 +2498,8 @@
_PATH_HOST_DSA_KEY_FILE, rr_hostname);
n += do_print_resource_record(pw,
_PATH_HOST_ECDSA_KEY_FILE, rr_hostname);
-
+ n += do_print_resource_record(pw,
+ _PATH_HOST_ED25519_KEY_FILE, rr_hostname);
if (n == 0)
fatal("no keys found.");
exit(0);