diff options
author | Colin Watson <cjwatson@debian.org> | 2012-09-06 23:20:10 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-09-06 23:20:10 +0100 |
commit | c6a2c0334e45419875687d250aed9bea78480f2e (patch) | |
tree | d8f01bef9f3921fa1ca7592a19474be9c8349f76 /dns.h | |
parent | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (diff) | |
parent | 8b13b5bdc4f19bd52ee673104d66b71c21153b96 (diff) |
merge 6.1p1
Diffstat (limited to 'dns.h')
-rw-r--r-- | dns.h | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dns.h,v 1.11 2010/02/26 20:29:54 djm Exp $ */ | 1 | /* $OpenBSD: dns.h,v 1.12 2012/05/23 03:28:28 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2003 Wesley Griffin. All rights reserved. | 4 | * Copyright (c) 2003 Wesley Griffin. All rights reserved. |
@@ -29,14 +29,17 @@ | |||
29 | #define DNS_H | 29 | #define DNS_H |
30 | 30 | ||
31 | enum sshfp_types { | 31 | enum sshfp_types { |
32 | SSHFP_KEY_RESERVED, | 32 | SSHFP_KEY_RESERVED = 0, |
33 | SSHFP_KEY_RSA, | 33 | SSHFP_KEY_RSA = 1, |
34 | SSHFP_KEY_DSA | 34 | SSHFP_KEY_DSA = 2, |
35 | SSHFP_KEY_ECDSA = 3 | ||
35 | }; | 36 | }; |
36 | 37 | ||
37 | enum sshfp_hashes { | 38 | enum sshfp_hashes { |
38 | SSHFP_HASH_RESERVED, | 39 | SSHFP_HASH_RESERVED = 0, |
39 | SSHFP_HASH_SHA1 | 40 | SSHFP_HASH_SHA1 = 1, |
41 | SSHFP_HASH_SHA256 = 2, | ||
42 | SSHFP_HASH_MAX = 3 | ||
40 | }; | 43 | }; |
41 | 44 | ||
42 | #define DNS_RDATACLASS_IN 1 | 45 | #define DNS_RDATACLASS_IN 1 |