From 0e0278d2f0c9852784be5a698c2db5554cf8a93d Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Thu, 1 Jul 2021 12:37:52 -0700 Subject: [PATCH 1/2] chore: re-add BigUInt, OID imports needed when building for dfx --- ic-agent/src/identity/basic.rs | 2 +- ic-agent/src/identity/secp256k1.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ic-agent/src/identity/basic.rs b/ic-agent/src/identity/basic.rs index 9c5f22b2..152f5537 100644 --- a/ic-agent/src/identity/basic.rs +++ b/ic-agent/src/identity/basic.rs @@ -6,7 +6,7 @@ use crate::identity::error::PemError; use ring::signature::{Ed25519KeyPair, KeyPair}; use simple_asn1::ASN1Block::{BitString, ObjectIdentifier, Sequence}; -use simple_asn1::{oid, to_der}; +use simple_asn1::{oid, to_der, BigUint, OID}; /// A Basic Identity which sign using an ED25519 key pair. pub struct BasicIdentity { diff --git a/ic-agent/src/identity/secp256k1.rs b/ic-agent/src/identity/secp256k1.rs index 979acdf5..e9ee9900 100644 --- a/ic-agent/src/identity/secp256k1.rs +++ b/ic-agent/src/identity/secp256k1.rs @@ -12,7 +12,7 @@ use openssl::pkey::{Private, Public}; use openssl::sha::sha256; use simple_asn1::ASN1Block; use simple_asn1::ASN1Block::{BitString, ObjectIdentifier, Sequence}; -use simple_asn1::{oid, to_der}; +use simple_asn1::{oid, to_der, BigUint, OID}; #[derive(Clone, Debug)] pub struct Secp256k1Identity { From 27c1d0084f66c6631205b4d056f62f0db4ed0478 Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Thu, 1 Jul 2021 12:41:28 -0700 Subject: [PATCH 2/2] missed one --- ic-identity-hsm/src/hsm.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ic-identity-hsm/src/hsm.rs b/ic-identity-hsm/src/hsm.rs index 99050a91..20bc3202 100644 --- a/ic-identity-hsm/src/hsm.rs +++ b/ic-identity-hsm/src/hsm.rs @@ -9,7 +9,7 @@ use pkcs11::types::{ }; use pkcs11::Ctx; use simple_asn1::ASN1Block::{BitString, ObjectIdentifier, OctetString, Sequence}; -use simple_asn1::{from_der, oid, to_der, ASN1DecodeErr, ASN1EncodeErr}; +use simple_asn1::{from_der, oid, to_der, ASN1DecodeErr, ASN1EncodeErr, BigUint, OID}; use std::path::Path; use std::ptr; use thiserror::Error;