Make ASCII armor optional

Signed-off-by: András Veres-Szentkirályi <vsza@vsza.hu>

Author: dnet

src/encrypt.rs

@@ -14,11 +14,12 @@ use crate::cert::Cert;
 use crate::signer::PySigner;
 
 #[pyfunction]
-#[pyo3(signature = (recipients, bytes, signer=None))]
+#[pyo3(signature = (recipients, bytes, signer=None, *, armor=true))]
 pub fn encrypt(
     recipients: Vec<PyRef<Cert>>,
     bytes: &[u8],
     signer: Option<PySigner>,
+    armor: bool,
 ) -> PyResult<Cow<'static, [u8]>> {
     let mode = KeyFlags::empty()
         .set_storage_encryption()
@@ -67,7 +68,11 @@ pub fn encrypt(
 
     let message = Message::new(&mut sink);
 
-    let message = Armorer::new(message).build()?;
+    let message = if armor {
+        Armorer::new(message).build()?
+    } else {
+        message
+    };
 
     let mut message = Encryptor::for_recipients(
         message,

src/sign.rs

@@ -20,16 +20,21 @@ pub enum SignatureMode {
 }
 
 #[pyfunction]
-#[pyo3(signature = (signer, bytes, *, mode=&SignatureMode::Inline))]
-pub fn sign(signer: PySigner, bytes: &[u8], mode: &SignatureMode) -> PyResult<Cow<'static, [u8]>> {
+#[pyo3(signature = (signer, bytes, *, mode=&SignatureMode::Inline, armor=true))]
+pub fn sign(
+    signer: PySigner,
+    bytes: &[u8],
+    mode: &SignatureMode,
+    armor: bool,
+) -> PyResult<Cow<'static, [u8]>> {
     use sequoia_openpgp::serialize::stream::Signer;
 
     let mut sink = vec![];
     {
         let message = Message::new(&mut sink);
-        let message = if mode == &SignatureMode::Inline {
+        let message = if mode == &SignatureMode::Inline && armor {
             Armorer::new(message).kind(armor::Kind::Message).build()?
-        } else if mode == &SignatureMode::Detached {
+        } else if mode == &SignatureMode::Detached && armor {
             Armorer::new(message).kind(armor::Kind::Signature).build()?
         } else {
             message