RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-03 00:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

- logan@cvs.openbsd.org 2014/04/20 09:24:26

Browse Source 
[dns.c dns.h ssh-keygen.c]
     Add support for SSHFP DNS records for ED25519 key types.
     OK from djm@
This commit is contained in:
Damien Miller 2014-05-15 13:45:58 +10:00
parent ec0b67eb3b
commit 16cd3928a8
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,6 +1,11 @@
20140519 20140519
- (djm) [rijndael.c rijndael.h] Sync with newly-ressurected versions ine - (djm) [rijndael.c rijndael.h] Sync with newly-ressurected versions ine
OpenBSD 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 20140430
- (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already

7
dns.c
View File

@ -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. * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@ -96,6 +96,11 @@ dns_read_key(u_int8_t *algorithm, u_int8_t *digest_type,
if (!*digest_type) if (!*digest_type)
*digest_type = SSHFP_HASH_SHA256; *digest_type = SSHFP_HASH_SHA256;
break; break;
case KEY_ED25519:
*algorithm = SSHFP_KEY_ED25519;
if (!*digest_type)
*digest_type = SSHFP_HASH_SHA256;
break;
default: default:
*algorithm = SSHFP_KEY_RESERVED; /* 0 */ *algorithm = SSHFP_KEY_RESERVED; /* 0 */
*digest_type = SSHFP_HASH_RESERVED; /* 0 */ *digest_type = SSHFP_HASH_RESERVED; /* 0 */

5
dns.h
View File

@ -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. * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@ -32,7 +32,8 @@ enum sshfp_types {
SSHFP_KEY_RESERVED = 0, SSHFP_KEY_RESERVED = 0,
SSHFP_KEY_RSA = 1, SSHFP_KEY_RSA = 1,
SSHFP_KEY_DSA = 2, SSHFP_KEY_DSA = 2,
SSHFP_KEY_ECDSA = 3 SSHFP_KEY_ECDSA = 3,
SSHFP_KEY_ED25519 = 4
}; };
enum sshfp_hashes { enum sshfp_hashes {

5
ssh-keygen.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -2498,7 +2498,8 @@ main(int argc, char **argv)
_PATH_HOST_DSA_KEY_FILE, rr_hostname); _PATH_HOST_DSA_KEY_FILE, rr_hostname);
n += do_print_resource_record(pw, n += do_print_resource_record(pw,
_PATH_HOST_ECDSA_KEY_FILE, rr_hostname); _PATH_HOST_ECDSA_KEY_FILE, rr_hostname);
n += do_print_resource_record(pw,
_PATH_HOST_ED25519_KEY_FILE, rr_hostname);
if (n == 0) if (n == 0)
fatal("no keys found."); fatal("no keys found.");
exit(0); exit(0);