add features and preferred algorithms to the public key

Author: link2xt

src/key.rs

@@ -9,10 +9,15 @@ use base64::Engine as _;
 use deltachat_contact_tools::EmailAddress;
 use pgp::composed::Deserializable;
 pub use pgp::composed::{SignedPublicKey, SignedSecretKey};
-use pgp::packet::PacketTrait as _;
-use pgp::packet::{Notation, SignatureConfig, SignatureType, Subpacket, SubpacketData};
+use pgp::crypto::aead::AeadAlgorithm;
+use pgp::crypto::hash::HashAlgorithm;
+use pgp::crypto::sym::SymmetricKeyAlgorithm;
+use pgp::packet::{
+    Features, KeyFlags, Notation, PacketTrait as _, SignatureConfig, SignatureType, Subpacket,
+    SubpacketData,
+};
 use pgp::ser::Serialize;
-use pgp::types::{KeyDetails, KeyVersion};
+use pgp::types::{CompressionAlgorithm, KeyDetails, KeyVersion};
 use rand_old::thread_rng;
 use tokio::runtime::Handle;
 
@@ -149,17 +154,38 @@ pub(crate) async fn secret_key_to_public_key(
             name: "relays@chatmail.at".into(),
             value: all_addrs.into(),
         };
+        let mut keyflags = KeyFlags::default();
+        keyflags.set_certify(true);
+        keyflags.set_sign(true);
+        let mut features = Features::default();
+        features.set_seipd_v1(true);
+        features.set_seipd_v2(true);
         signature_config.hashed_subpackets = vec![
             Subpacket::regular(SubpacketData::SignatureCreationTime(now))?,
             Subpacket::regular(SubpacketData::IssuerFingerprint(
                 signed_secret_key.fingerprint(),
             ))?,
-            //Subpacket::regular(SubpacketData::KeyFlags(TODO))
-            //Subpacket::regular(SubpacketData::Features(TODO))
-            //Subpacket::regular(SubpacketData::PreferredSymmetricALgorithms(TODO)
-            //Subpacket::regular(SubpacketData::PreferredHashAlgorithms(TODO)
-            //Subpacket::regular(SubpacketData::PreferredCompressionAlgorithms(TODO)
-            //Subpacket::regular(SubpacketData::PreferredAeadAlgorithms(TODO)
+            Subpacket::regular(SubpacketData::KeyFlags(keyflags))?,
+            Subpacket::regular(SubpacketData::Features(features))?,
+            Subpacket::regular(SubpacketData::PreferredSymmetricAlgorithms(smallvec![
+                SymmetricKeyAlgorithm::AES256,
+                SymmetricKeyAlgorithm::AES192,
+                SymmetricKeyAlgorithm::AES128
+            ]))?,
+            Subpacket::regular(SubpacketData::PreferredHashAlgorithms(smallvec![
+                HashAlgorithm::Sha256,
+                HashAlgorithm::Sha384,
+                HashAlgorithm::Sha512,
+                HashAlgorithm::Sha224,
+            ]))?,
+            Subpacket::regular(SubpacketData::PreferredCompressionAlgorithms(smallvec![
+                CompressionAlgorithm::ZLIB,
+                CompressionAlgorithm::ZIP,
+            ]))?,
+            Subpacket::regular(SubpacketData::PreferredAeadAlgorithms(smallvec![(
+                SymmetricKeyAlgorithm::AES256,
+                AeadAlgorithm::Ocb
+            )]))?,
             Subpacket::regular(SubpacketData::IsPrimary(true))?,
             Subpacket::regular(SubpacketData::Notation(notation))?,
         ];