openpgp: Move packet::KeyFlags to constants.

19 files changed, 33 insertions, 43 deletions

diff --git a/guide/src/chapter_02.md b/guide/src/chapter_02.md
index 43418bca..3eb0fad5 100644
--- a/guide/src/chapter_02.md
+++ b/guide/src/chapter_02.md
@@ -13,9 +13,8 @@ use std::io::{self, Write};
 
 extern crate sequoia_openpgp as openpgp;
 use openpgp::crypto::SessionKey;
-use openpgp::constants::SymmetricAlgorithm;
+use openpgp::constants::{KeyFlags, SymmetricAlgorithm};
 use openpgp::serialize::stream::*;
-use openpgp::packet::prelude::*;
 use openpgp::parse::stream::*;
 
 const MESSAGE: &'static str = "дружба";
@@ -126,13 +125,12 @@ fn main() {
 #         where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()>
 #     {
 #         // The encryption key is the first and only subkey.
-#         let key : key::UnspecifiedSecret
-#             = self.secret.subkeys().nth(0)
+#         let key = self.secret.subkeys().nth(0)
 #             .map(|binding| binding.key().clone())
-#             .unwrap().into();
+#             .unwrap();
 #
 #         // The secret key is not encrypted.
-#         let mut pair = key.into_keypair().unwrap();
+#         let mut pair = key.mark_parts_secret().into_keypair().unwrap();
 #
 #         pkesks[0].decrypt(&mut pair)
 #             .and_then(|(algo, session_key)| decrypt(algo, &session_key))
@@ -156,9 +154,8 @@ create it:
 #
 # extern crate sequoia_openpgp as openpgp;
 # use openpgp::crypto::SessionKey;
-# use openpgp::constants::SymmetricAlgorithm;
+# use openpgp::constants::{KeyFlags, SymmetricAlgorithm};
 # use openpgp::serialize::stream::*;
-# use openpgp::packet::prelude::*;
 # use openpgp::parse::stream::*;
 #
 # const MESSAGE: &'static str = "дружба";
@@ -269,13 +266,12 @@ fn generate() -> openpgp::Result<openpgp::TPK> {
 #         where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()>
 #     {
 #         // The encryption key is the first and only subkey.
-#         let key : key::UnspecifiedSecret
-#             = self.secret.subkeys().nth(0)
+#         let key = self.secret.subkeys().nth(0)
 #             .map(|binding| binding.key().clone())
-#             .unwrap().into();
+#             .unwrap();
 #
 #         // The secret key is not encrypted.
-#         let mut pair = key.into_keypair().unwrap();
+#         let mut pair = key.mark_parts_secret().into_keypair().unwrap();
 #
 #         pkesks[0].decrypt(&mut pair)
 #             .and_then(|(algo, session_key)| decrypt(algo, &session_key))
@@ -299,9 +295,8 @@ implements [`io::Write`], and we simply write the plaintext to it.
 #
 # extern crate sequoia_openpgp as openpgp;
 # use openpgp::crypto::SessionKey;
-# use openpgp::constants::SymmetricAlgorithm;
+# use openpgp::constants::{KeyFlags, SymmetricAlgorithm};
 # use openpgp::serialize::stream::*;
-# use openpgp::packet::prelude::*;
 # use openpgp::parse::stream::*;
 #
 # const MESSAGE: &'static str = "дружба";
@@ -412,13 +407,12 @@ fn encrypt(sink: &mut Write, plaintext: &str, recipient: &openpgp::TPK)
 #         where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()>
 #     {
 #         // The encryption key is the first and only subkey.
-#         let key : key::UnspecifiedSecret
-#             = self.secret.subkeys().nth(0)
+#         let key = self.secret.subkeys().nth(0)
 #             .map(|binding| binding.key().clone())
-#             .unwrap().into();
+#             .unwrap();
 #
 #         // The secret key is not encrypted.
-#         let mut pair = key.into_keypair().unwrap();
+#         let mut pair = key.mark_parts_secret().into_keypair().unwrap();
 #
 #         pkesks[0].decrypt(&mut pair)
 #             .and_then(|(algo, session_key)| decrypt(algo, &session_key))
@@ -456,9 +450,8 @@ Decrypted data can be read from this using [`io::Read`].
 #
 # extern crate sequoia_openpgp as openpgp;
 # use openpgp::crypto::SessionKey;
-# use openpgp::constants::SymmetricAlgorithm;
+# use openpgp::constants::{KeyFlags, SymmetricAlgorithm};
 # use openpgp::serialize::stream::*;
-# use openpgp::packet::prelude::*;
 # use openpgp::parse::stream::*;
 #
 # const MESSAGE: &'static str = "дружба";
@@ -569,13 +562,12 @@ impl<'a> DecryptionHelper for Helper<'a> {
         where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()>
     {
         // The encryption key is the first and only subkey.
-        let key : key::UnspecifiedSecret
-            = self.secret.subkeys().nth(0)
+        let key = self.secret.subkeys().nth(0)
             .map(|binding| binding.key().clone())
-            .unwrap().into();
+            .unwrap();
 
         // The secret key is not encrypted.
-        let mut pair = key.into_keypair().unwrap();
+        let mut pair = key.mark_parts_secret().into_keypair().unwrap();
 
         pkesks[0].decrypt(&mut pair)
             .and_then(|(algo, session_key)| decrypt(algo, &session_key))
diff --git a/ipc/tests/gpg-agent.rs b/ipc/tests/gpg-agent.rs
index e502a871..3a7b44b5 100644
--- a/ipc/tests/gpg-agent.rs
+++ b/ipc/tests/gpg-agent.rs
@@ -12,7 +12,7 @@ use crate::openpgp::constants::{
     SymmetricAlgorithm,
 };
 use crate::openpgp::crypto::SessionKey;
-use crate::openpgp::packet::KeyFlags;
+use crate::openpgp::constants::KeyFlags;
 use crate::openpgp::parse::stream::*;
 use crate::openpgp::serialize::{Serialize, stream::*};
 use crate::openpgp::tpk::{TPKBuilder, CipherSuite};
diff --git a/openpgp/examples/encrypt-for.rs b/openpgp/examples/encrypt-for.rs
index 47fb703d..7b1f48e7 100644
--- a/openpgp/examples/encrypt-for.rs
+++ b/openpgp/examples/encrypt-for.rs
@@ -6,7 +6,7 @@ use std::io;
 
 extern crate sequoia_openpgp as openpgp;
 use crate::openpgp::armor;
-use crate::openpgp::packet::KeyFlags;
+use crate::openpgp::constants::KeyFlags;
 use crate::openpgp::parse::Parse;
 use crate::openpgp::serialize::stream::{
     Message, LiteralWriter, Encryptor,
diff --git a/openpgp/examples/generate-encrypt-decrypt.rs b/openpgp/examples/generate-encrypt-decrypt.rs
index 6157019f..90640ba3 100644
--- a/openpgp/examples/generate-encrypt-decrypt.rs
+++ b/openpgp/examples/generate-encrypt-decrypt.rs
@@ -4,9 +4,8 @@ use std::io::{self, Write};
 
 extern crate sequoia_openpgp as openpgp;
 use crate::openpgp::crypto::SessionKey;
-use crate::openpgp::constants::SymmetricAlgorithm;
+use crate::openpgp::constants::{KeyFlags, SymmetricAlgorithm};
 use crate::openpgp::serialize::stream::*;
-use crate::openpgp::packet::KeyFlags;
 use crate::openpgp::parse::stream::*;
 
 const MESSAGE: &'static str = "дружба";
diff --git a/openpgp/examples/pad.rs b/openpgp/examples/pad.rs
index 681bfe53..eaaaeba8 100644
--- a/openpgp/examples/pad.rs
+++ b/openpgp/examples/pad.rs
@@ -7,7 +7,7 @@ use std::io;
 extern crate sequoia_openpgp as openpgp;
 use crate::openpgp::armor;
 use crate::openpgp::KeyID;
-use crate::openpgp::packet::KeyFlags;
+use crate::openpgp::constants::KeyFlags;
 use crate::openpgp::parse::Parse;
 use crate::openpgp::serialize::stream::{
     Message, LiteralWriter, Encryptor, Recipient,
diff --git a/openpgp/src/packet/key_flags.rs b/openpgp/src/constants/key_flags.rs
index 51f9e00d..51f9e00d 100644
--- a/openpgp/src/packet/key_flags.rs
+++ b/openpgp/src/constants/key_flags.rs
diff --git a/openpgp/src/constants/mod.rs b/openpgp/src/constants/mod.rs
index efa7b962..5c86328b 100644
--- a/openpgp/src/constants/mod.rs
+++ b/openpgp/src/constants/mod.rs
@@ -14,6 +14,8 @@ use crate::Result;
 
 mod features;
 pub use self::features::Features;
+mod key_flags;
+pub use self::key_flags::KeyFlags;
 
 /// The OpenPGP public key algorithms as defined in [Section 9.1 of
 /// RFC 4880], and [Section 5 of RFC 6637].
diff --git a/openpgp/src/packet/mod.rs b/openpgp/src/packet/mod.rs
index 58bc7ff4..94277a8a 100644
--- a/openpgp/src/packet/mod.rs
+++ b/openpgp/src/packet/mod.rs
@@ -45,8 +45,6 @@ pub mod pkesk;
 mod mdc;
 pub use self::mdc::MDC;
 pub mod aed;
-mod key_flags;
-pub use self::key_flags::KeyFlags;
 mod server_preferences;
 pub use self::server_preferences::KeyServerPreferences;
 
diff --git a/openpgp/src/packet/prelude.rs b/openpgp/src/packet/prelude.rs
index 2d5c9407..b8297cbf 100644
--- a/openpgp/src/packet/prelude.rs
+++ b/openpgp/src/packet/prelude.rs
@@ -12,7 +12,6 @@ pub use crate::packet::{
     one_pass_sig::OnePassSig3,
     Key,
     key,
-    KeyFlags,
     key::Key4,
     key::SecretKeyMaterial,
     Marker,
diff --git a/openpgp/src/packet/signature/subpacket.rs b/openpgp/src/packet/signature/subpacket.rs
index 9f5bf579..7caa88c7 100644
--- a/openpgp/src/packet/signature/subpacket.rs
+++ b/openpgp/src/packet/signature/subpacket.rs
@@ -74,7 +74,6 @@ use crate::{
     packet::signature::{self, Signature4},
     packet::key,
     packet::Key,
-    packet::KeyFlags,
     packet::KeyServerPreferences,
     Packet,
     Fingerprint,
@@ -85,6 +84,7 @@ use crate::constants::{
     CompressionAlgorithm,
     Features,
     HashAlgorithm,
+    KeyFlags,
     PublicKeyAlgorithm,
     ReasonForRevocation,
     SymmetricAlgorithm,
diff --git a/openpgp/src/serialize/stream.rs b/openpgp/src/serialize/stream.rs
index 59fc5f96..8869eb9a 100644
--- a/openpgp/src/serialize/stream.rs
+++ b/openpgp/src/serialize/stream.rs
@@ -921,7 +921,7 @@ impl<'a> Encryptor<'a> {
     /// ```
     /// use std::io::Write;
     /// extern crate sequoia_openpgp as openpgp;
-    /// use openpgp::packet::KeyFlags;
+    /// use openpgp::constants::KeyFlags;
     /// use openpgp::serialize::stream::{
     ///     Message, Encryptor, LiteralWriter,
     /// };
diff --git a/openpgp/src/serialize/tpk.rs b/openpgp/src/serialize/tpk.rs
index 9957d60b..8f35d653 100644
--- a/openpgp/src/serialize/tpk.rs
+++ b/openpgp/src/serialize/tpk.rs
@@ -719,10 +719,10 @@ mod test {
     fn export() {
         use crate::Packet;
         use crate::tpk::TPKBuilder;
-        use crate::constants::{Curve, SignatureType};
+        use crate::constants::{Curve, KeyFlags, SignatureType};
         use crate::packet::{
             signature, UserID, user_attribute::{UserAttribute, Subpacket},
-            KeyFlags, key::Key4,
+            key::Key4,
         };
 
         let (tpk, _) = TPKBuilder::new().generate().unwrap();
diff --git a/openpgp/src/tpk/builder.rs b/openpgp/src/tpk/builder.rs
index 3401b109..0da847f2 100644
--- a/openpgp/src/tpk/builder.rs
+++ b/openpgp/src/tpk/builder.rs
@@ -1,7 +1,6 @@
 use time;
 
 use crate::packet;
-use crate::packet::{KeyFlags};
 use crate::packet::{
     key,
     Key,
@@ -18,6 +17,7 @@ use crate::autocrypt::Autocrypt;
 use crate::constants::{
     Features,
     HashAlgorithm,
+    KeyFlags,
     SignatureType,
     SymmetricAlgorithm,
 };
diff --git a/openpgp/src/tpk/keyiter.rs b/openpgp/src/tpk/keyiter.rs
index 9c1635dc..c1383c73 100644
--- a/openpgp/src/tpk/keyiter.rs
+++ b/openpgp/src/tpk/keyiter.rs
@@ -5,7 +5,7 @@ use crate::{
     packet::key,
     packet::Key,
     packet::key::SecretKeyMaterial,
-    packet::KeyFlags,
+    constants::KeyFlags,
     packet::Signature,
     TPK,
     tpk::KeyBindingIter,
diff --git a/openpgp/src/tpk/mod.rs b/openpgp/src/tpk/mod.rs
index 3ac9f4f7..fa8d1ea7 100644
--- a/openpgp/src/tpk/mod.rs
+++ b/openpgp/src/tpk/mod.rs
@@ -1632,7 +1632,7 @@ mod test {
 
     use crate::{
         KeyID,
-        packet::KeyFlags,
+        constants::KeyFlags,
     };
 
     fn parse_tpk(data: &[u8], as_message: bool) -> Result<TPK> {
diff --git a/tool/src/commands/inspect.rs b/tool/src/commands/inspect.rs
index f1b9f625..bb8ed112 100644
--- a/tool/src/commands/inspect.rs
+++ b/tool/src/commands/inspect.rs
@@ -227,7 +227,7 @@ fn inspect_revocation(output: &mut io::Write,
     Ok(())
 }
 
-fn inspect_key_flags(flags: openpgp::packet::KeyFlags) -> Option<String> {
+fn inspect_key_flags(flags: openpgp::constants::KeyFlags) -> Option<String> {
     let mut capabilities = Vec::new();
     if flags.can_certify() {
         capabilities.push("certification")
diff --git a/tool/src/commands/key.rs b/tool/src/commands/key.rs
index 8c765bca..5b048e4a 100644
--- a/tool/src/commands/key.rs
+++ b/tool/src/commands/key.rs
@@ -5,7 +5,7 @@ use itertools::Itertools;
 
 use crate::openpgp::Packet;
 use crate::openpgp::tpk::{TPKBuilder, CipherSuite};
-use crate::openpgp::packet::KeyFlags;
+use crate::openpgp::constants::KeyFlags;
 use crate::openpgp::armor::{Writer, Kind};
 use crate::openpgp::serialize::Serialize;
 
diff --git a/tool/src/commands/mod.rs b/tool/src/commands/mod.rs
index f07b5445..f9cbb776 100644
--- a/tool/src/commands/mod.rs
+++ b/tool/src/commands/mod.rs
@@ -88,7 +88,7 @@ pub fn encrypt(store: &mut store::Store,
                input: &mut io::Read, output: &mut io::Write,
                npasswords: usize, recipients: Vec<&str>,
                mut tpks: Vec<openpgp::TPK>, signers: Vec<openpgp::TPK>,
-               mode: KeyFlags,
+               mode: openpgp::constants::KeyFlags,
                compression: &str)
                -> Result<()> {
     for r in recipients {
diff --git a/tool/src/sq.rs b/tool/src/sq.rs
index db0b1339..ac247978 100644
--- a/tool/src/sq.rs
+++ b/tool/src/sq.rs
@@ -26,7 +26,7 @@ extern crate sequoia_store;
 
 use crate::openpgp::{armor, autocrypt, Fingerprint, TPK};
 use crate::openpgp::conversions::hex;
-use crate::openpgp::packet::KeyFlags;
+use crate::openpgp::constants::KeyFlags;
 use crate::openpgp::parse::Parse;
 use crate::openpgp::serialize::Serialize;
 use crate::openpgp::tpk::TPKParser;