summaryrefslogtreecommitdiffstats
path: root/openpgp-ffi/src
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@pep.foundation>2020-02-20 16:16:02 +0100
committerNeal H. Walfield <neal@pep.foundation>2020-02-20 16:19:46 +0100
commit8bb6ca2b4a99cc2824c7fb6d8f34d8086e99e852 (patch)
treebfa255a9e9a9c6c7531eb3dd5a404de203b0b0cc /openpgp-ffi/src
parent2164d2e3db8c66ab98164465eaf821eb7765a760 (diff)
openpgp: Split the ValidAmalgamation trait.
- Split the ValidAmalgamation trait into two traits, Amalgamation and ValidAmalgamation, so that the functionality made available by the Amalgamation trait can be provided by a ComponentAmalgamation, which doesn't have a policy.
Diffstat (limited to 'openpgp-ffi/src')
-rw-r--r--openpgp-ffi/src/parse/stream.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/openpgp-ffi/src/parse/stream.rs b/openpgp-ffi/src/parse/stream.rs
index 9c6a8de5..419c5c5d 100644
--- a/openpgp-ffi/src/parse/stream.rs
+++ b/openpgp-ffi/src/parse/stream.rs
@@ -16,7 +16,10 @@ use libc::{c_int, c_void, time_t};
extern crate sequoia_openpgp as openpgp;
use self::openpgp::{
- cert::components::ValidAmalgamation,
+ cert::components::{
+ Amalgamation,
+ ValidAmalgamation,
+ },
crypto::SessionKey,
types::SymmetricAlgorithm,
packet::{