Merge pull request C2SP#13 from carl-wallace/refactor

restore pqckeys
baloo · Jun 24, 2023 · 7e1accb · 7e1accb
2 parents bfd0c8e + f31dcf7
commit 7e1accb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/certval/Cargo.toml b/certval/Cargo.toml
@@ -24,7 +24,7 @@ der = { version="0.7.6", features = ["alloc", "derive", "flagset", "oid"] }
 x509-ocsp = { git = "https://github.com/RustCrypto/formats" }
 base64ct = { version="1.6.0", features = ["alloc"], optional=true }
 spki = { version = "0.7.2", default-features = false, features = ["alloc"] }
-#pqckeys = { git = "https://github.com/carl-wallace/formats", branch = "pqc" }
+pqckeys = { git = "https://github.com/carl-wallace/pqckeys" }
 pem-rfc7468 = { version="0.7.0", features = ["alloc"]}
 
 pkiprocmacros = { path = "../pkiprocmacros"}

diff --git a/certval/src/builder/uri_utils.rs b/certval/src/builder/uri_utils.rs
@@ -8,8 +8,9 @@ use x509_cert::ext::pkix::name::GeneralName;
 
 use crate::util::pdv_utilities::*;
 use crate::*;
-use cms::content_info::ContentInfo;
-use cms::signed_data::SignedData;
+
+#[cfg(feature = "remote")]
+use cms::{content_info::ContentInfo, signed_data::SignedData};
 
 use cfg_if::cfg_if;
 cfg_if! {

diff --git a/certval/src/util/crypto.rs b/certval/src/util/crypto.rs
@@ -343,7 +343,7 @@ pub fn verify_signature_message_composite_pqcrypto(
         // Parse each composite value
         // Params is an AnyRef, so it needs to be encoded to access value
         let params_enc = if let Some(p) = &signature_alg.parameters {
-            match p.to_vec() {
+            match p.to_der() {
                 Ok(rv) => rv,
                 Err(_e) => return Err(Error::Unrecognized),
             }

diff --git a/certval/src/validator/pdv_trust_anchor.rs b/certval/src/validator/pdv_trust_anchor.rs
@@ -1,4 +1,5 @@
 //! Wrappers around asn.1 encoder/decoder structures to support certification path processing
+use alloc::vec::Vec;
 
 use const_oid::db::rfc5912::{
     ID_CE_AUTHORITY_KEY_IDENTIFIER, ID_CE_BASIC_CONSTRAINTS, ID_CE_CERTIFICATE_POLICIES,