diff options
| -rw-r--r-- | openpgp-ffi/src/cert.rs | 4 | ||||
| -rw-r--r-- | openpgp/src/cert/components.rs | 13 | ||||
| -rw-r--r-- | openpgp/src/cert/mod.rs | 6 | ||||
| -rw-r--r-- | openpgp/src/parse/stream.rs | 2 | ||||
| -rw-r--r-- | tool/src/commands/inspect.rs | 2 |
5 files changed, 20 insertions, 7 deletions
diff --git a/openpgp-ffi/src/cert.rs b/openpgp-ffi/src/cert.rs index bfba521c..bf11d925 100644 --- a/openpgp-ffi/src/cert.rs +++ b/openpgp-ffi/src/cert.rs @@ -20,15 +20,15 @@ use self::openpgp::{ }, cert::{ CipherSuite, - KeyIter, CertBuilder, CertParser, CertRevocationBuilder, - ValidKeyIter, components::{ Amalgamation, + KeyIter, UserIDBundle, UserIDBundleIter, + ValidKeyIter, }, }, }; diff --git a/openpgp/src/cert/components.rs b/openpgp/src/cert/components.rs index 1074899c..b3a23fc4 100644 --- a/openpgp/src/cert/components.rs +++ b/openpgp/src/cert/components.rs @@ -28,6 +28,19 @@ pub use super::amalgamation::{ ComponentAmalgamation, ValidComponentAmalgamation, }; +pub use super::key_amalgamation::{ + KeyAmalgamation, + PrimaryKeyAmalgamation, + ValidKeyAmalgamation, +}; +pub use super::component_iter::{ + ComponentIter, +}; +pub use super::keyiter::{ + KeyIter, + ValidKeyIter, +}; + /// A key (primary or subkey, public or private) and any associated /// signatures. diff --git a/openpgp/src/cert/mod.rs b/openpgp/src/cert/mod.rs index 0dc4fde6..5051a225 100644 --- a/openpgp/src/cert/mod.rs +++ b/openpgp/src/cert/mod.rs @@ -51,7 +51,7 @@ use components::{ ValidComponentAmalgamation, }; mod component_iter; -pub use component_iter::{ +use component_iter::{ ComponentIter, }; mod keyiter; @@ -61,8 +61,8 @@ mod revoke; pub use self::builder::{CertBuilder, CipherSuite}; -pub use keyiter::{KeyIter, ValidKeyIter}; -pub use key_amalgamation::{ +use keyiter::KeyIter; +use key_amalgamation::{ KeyAmalgamation, PrimaryKeyAmalgamation, ValidKeyAmalgamation, diff --git a/openpgp/src/parse/stream.rs b/openpgp/src/parse/stream.rs index 755b700f..08717d7b 100644 --- a/openpgp/src/parse/stream.rs +++ b/openpgp/src/parse/stream.rs @@ -45,8 +45,8 @@ use crate::{ Cert, cert::components::{ Amalgamation, + ValidKeyAmalgamation, }, - cert::ValidKeyAmalgamation, crypto::SessionKey, serialize::Serialize, policy::Policy, diff --git a/tool/src/commands/inspect.rs b/tool/src/commands/inspect.rs index fedc792e..a70524e5 100644 --- a/tool/src/commands/inspect.rs +++ b/tool/src/commands/inspect.rs @@ -207,7 +207,7 @@ fn inspect_cert(policy: &dyn Policy, fn inspect_key(policy: &dyn Policy, output: &mut dyn io::Write, indent: &str, - ka: openpgp::cert::KeyAmalgamation<PublicParts>, + ka: openpgp::cert::components::KeyAmalgamation<PublicParts>, print_keygrips: bool, print_certifications: bool) -> Result<()> |