diff options
author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2012-09-03 16:51:41 +0000 |
---|---|---|
committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2012-09-03 16:51:41 +0000 |
commit | 462c32cb8d7a451c999a3f1e7d00f9c89e96700c (patch) | |
tree | eafe8a40bcffb53c6bb88d75ac823cdc99ac92fe /crypto/openssh/dns.h | |
parent | f83fab023465a81d3ae1a9b90bad97409ecd9d51 (diff) | |
parent | 925f1fb7e466dbf645650dc4ea9d2a34e728ef9c (diff) | |
download | src-462c32cb8d7a451c999a3f1e7d00f9c89e96700c.tar.gz src-462c32cb8d7a451c999a3f1e7d00f9c89e96700c.zip |
Upgrade OpenSSH to 6.1p1.
Notes
Notes:
svn path=/head/; revision=240075
Diffstat (limited to 'crypto/openssh/dns.h')
-rw-r--r-- | crypto/openssh/dns.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/crypto/openssh/dns.h b/crypto/openssh/dns.h index 90cfd7b92ce2..d5f428177803 100644 --- a/crypto/openssh/dns.h +++ b/crypto/openssh/dns.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dns.h,v 1.11 2010/02/26 20:29:54 djm Exp $ */ +/* $OpenBSD: dns.h,v 1.12 2012/05/23 03:28:28 djm Exp $ */ /* * Copyright (c) 2003 Wesley Griffin. All rights reserved. @@ -29,14 +29,17 @@ #define DNS_H enum sshfp_types { - SSHFP_KEY_RESERVED, - SSHFP_KEY_RSA, - SSHFP_KEY_DSA + SSHFP_KEY_RESERVED = 0, + SSHFP_KEY_RSA = 1, + SSHFP_KEY_DSA = 2, + SSHFP_KEY_ECDSA = 3 }; enum sshfp_hashes { - SSHFP_HASH_RESERVED, - SSHFP_HASH_SHA1 + SSHFP_HASH_RESERVED = 0, + SSHFP_HASH_SHA1 = 1, + SSHFP_HASH_SHA256 = 2, + SSHFP_HASH_MAX = 3 }; #define DNS_RDATACLASS_IN 1 |