Adds feature to upload and retrieve public keys from DSM

README.md

@@ -437,7 +437,7 @@ When building, make sure to disable default features (to disable
 Nettle) and enable the CNG via `crypto-cng` Cargo feature:
 
 ```bash
-$ cargo build --no-default-features --features crypto-cng,compression # Only change crypto backend
+$ cargo build --no-default-features --features net,crypto-cng,compression
 ```
 
 [`capnp`]: https://capnproto.org/install.html

guide/Cargo.toml

@@ -12,8 +12,16 @@ repository = "https://gitlab.com/sequoia-pgp/sequoia"
 build = "build.rs"
 
 [dependencies]
-sequoia-openpgp = { path = "../openpgp", version = "1.0.0" }
+sequoia-openpgp = { path = "../openpgp", version = "1.0.0", default-features = false }
 anyhow = "1.0.18"
 
 [lib]
 bench = false
+
+[features]
+default = ["sequoia-openpgp/default"]
+crypto-nettle = ["sequoia-openpgp/crypto-nettle"]
+crypto-cng = ["sequoia-openpgp/crypto-cng"]
+compression = ["sequoia-openpgp/compression"]
+compression-deflate = ["sequoia-openpgp/compression-deflate"]
+compression-bzip2 = ["sequoia-openpgp/compression-bzip2"]

openpgp-dsm/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "openpgp-dsm"
-version = "1.6.1"
+version = "1.7.0"
 authors = ["zugzwang <[email protected]>"]
 edition = "2018"
 

openpgp-dsm/src/der.rs

@@ -186,7 +186,7 @@ pub mod serialize {
             })
         })
     }
-
+    
     pub fn ec_private_25519(curve: &Curve, x: Vec<u8>) -> Result<Vec<u8>> {
         let opaque_octet_string = yasna::construct_der(|w| {
             w.write_bytes(&x);
@@ -235,19 +235,42 @@ pub mod serialize {
         }))
     }
 
-    pub fn spki_ecdh(curve: &Curve, e: &mpi::MPI) -> Vec<u8> {
+    pub fn spki_rsa(n: &mpi::MPI, e: &mpi::MPI) -> Vec<u8> {
+        // RSA public key
+        let rsa_public_key = yasna::construct_der(|der_writer| {
+            der_writer.write_sequence_of(|w| {
+                w.next()
+                    .write_biguint(&BigUint::from_bytes_be(n.value()));
+                w.next()
+                    .write_biguint(&BigUint::from_bytes_be(e.value()));
+            });
+        });
+
+        // Construct the SPKI structure
+        yasna::construct_der(|der_writer| {
+            der_writer.write_sequence_of(|w| {
+                w.next().write_sequence(|w| {
+                    w.next().write_oid(&Oid::from_slice(&[1, 2, 840, 113549, 1, 1, 1]));
+                    w.next().write_null();
+                });
+                w.next().write_bitvec(&BitVec::from_bytes(&rsa_public_key));
+            });
+        })
+    }
+
+    pub fn spki_ec(curve: &Curve, e: &mpi::MPI) -> Vec<u8> {
         match curve {
-            Curve::Cv25519 => {
+            Curve::Cv25519 | Curve::Ed25519 => {
                 let x = e.value();
                 assert!(!x.is_empty());
 
                 let x = x[1..].to_vec();
 
-                let curve_25519_oid = Oid::from_slice(&[1, 3, 101, 110]);
+                let oid = curve_oid(curve).expect("bad curve OID");
                 yasna::construct_der(|w| {
                     w.write_sequence(|w| {
                         w.next().write_sequence(|w| {
-                            w.next().write_oid(&curve_25519_oid);
+                            w.next().write_oid(&oid);
                         });
                         w.next().write_bitvec(&BitVec::from_bytes(&x))
                     });