colin/hickory-dns
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move all DNSSECRecordType variants into RecordType

Browse Source
This commit is contained in:
Benjamin Fry 2021-06-05 18:58:24 -07:00
parent 59d6343862
commit 0cc7874201
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -26,7 +26,7 @@ All notes should be prepended with the location of the change, e.g. `(proto)` or
### Removed
- (proto) removed `RecordType::DNSSEC` and moved all variants of `DNSSECRecordType` into `RecordType`
- (proto) removed `RecordType::DNSSEC` and moved all variants of `DNSSECRecordType` into `RecordType` #1506
- (proto) removed `BufStreamHandle` and `StreamHandle` #1433
- (response) disabled `mdns` to work on a new solution #1433

3
crates/client/src/serialize/txt/parse_rdata.rs
View File

@ -80,8 +80,9 @@ impl RDataParser for RData {
RecordType::RRSIG => {
return Err(ParseError::from("RRSIG should be dynamically generated"))
}
RecordType::TSIG => return Err(ParseError::from("TSIG is only used during AXFR")),
RecordType::ZERO => RData::ZERO,
r => {
r @ RecordType::Unknown(..) | r => {
// TODO: add a way to associate generic record types to the zone
return Err(ParseError::from(ParseErrorKind::UnsupportedRecordType(r)));
}

1
crates/proto/src/rr/dnssec/rdata/nsec.rs
View File

@ -214,7 +214,6 @@ mod tests {
#[test]
fn test() {
use crate::rr::dnssec::rdata::DNSSECRecordType;
use crate::rr::RecordType;
use std::str::FromStr;

2
crates/proto/src/rr/dnssec/rdata/tsig.rs
View File

@ -764,7 +764,7 @@ pub fn make_tsig_record(name: Name, rdata: TSIG) -> Record {
// NAME: The name of the key used, in domain name syntax
tsig.set_name(name)
// TYPE: This MUST be TSIG (250: Transaction SIGnature).
.set_record_type(RecordType::TSIG.into())
.set_record_type(RecordType::TSIG)
// CLASS: This MUST be ANY.
.set_dns_class(DNSClass::ANY)
// TTL: This MUST be 0.

2
crates/proto/src/rr/rr_set.rs
View File

@ -859,8 +859,8 @@ mod test {
#[cfg(feature = "dnssec")] // This tests RFC 6975, a DNSSEC-specific feature.
#[allow(clippy::blocks_in_if_conditions)]
fn test_get_filter() {
use crate::rr::dnssec::rdata::DNSSECRData;
use crate::rr::dnssec::rdata::SIG;
use crate::rr::dnssec::rdata::{DNSSECRData, RecordType};
use crate::rr::dnssec::{Algorithm, SupportedAlgorithms};
let name = Name::root();

2
crates/server/src/store/sqlite/authority.rs
View File

@ -445,7 +445,7 @@ impl SqliteAuthority {
use futures_executor::block_on;
use log::debug;
use crate::client::rr::rdata::{DNSSECRData, RecordType};
use crate::client::rr::rdata::DNSSECRData;
use crate::proto::rr::dnssec::Verifier;
// 3.3.3 - Pseudocode for Permission Checking

2
crates/server/tests/authority_battery/dnssec.rs
View File

@ -8,7 +8,7 @@ use futures_executor::block_on;
use trust_dns_client::op::Query;
use trust_dns_client::rr::dnssec::{Algorithm, SupportedAlgorithms, Verifier};
use trust_dns_client::rr::{DNSClass, Name, Record, RecordType};
use trust_dns_proto::rr::dnssec::rdata::{RecordType, DNSKEY};
use trust_dns_proto::rr::dnssec::rdata::DNSKEY;
use trust_dns_proto::xfer;
use trust_dns_server::authority::{AuthLookup, Authority};

2
tests/integration-tests/tests/client_future_tests.rs
View File

@ -288,7 +288,7 @@ async fn create_sig0_ready_client() -> (
) {
use openssl::rsa::Rsa;
use trust_dns_client::rr::dnssec::{Algorithm, KeyPair};
use trust_dns_client::rr::rdata::{DNSSECRData, RecordType};
use trust_dns_client::rr::rdata::DNSSECRData;
use trust_dns_server::store::sqlite::SqliteAuthority;
let authority = create_example();

2
tests/integration-tests/tests/client_tests.rs
View File

@ -437,7 +437,7 @@ fn test_nsec_query_type() {
fn create_sig0_ready_client(mut catalog: Catalog) -> (SyncClient<TestClientConnection>, Name) {
use openssl::rsa::Rsa;
use trust_dns_client::rr::dnssec::{Algorithm, KeyPair, Signer as SigSigner};
use trust_dns_proto::rr::dnssec::rdata::{DNSSECRData, RecordType, KEY};
use trust_dns_proto::rr::dnssec::rdata::{DNSSECRData, KEY};
use trust_dns_server::store::sqlite::SqliteAuthority;
let authority = create_example();