From 28f7cf1d12f0758ae1c75cfb7adca427238e132e Mon Sep 17 00:00:00 2001
From: Adam Wick <awick@uhsure.com>
Date: Sat, 20 Jan 2018 20:17:00 -0800
Subject: [PATCH] Parse both RSA and DSA keys.

---
 src/lib.rs       | 25 ++++++++-----------------
 src/publickey.rs | 44 +++++++++++++++++++++++---------------------
 2 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index c4ee6b3..10adb1e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -62,24 +62,16 @@ fn decode_certificate(x: &ASN1Block)
     //      extensions      [3]  Extensions OPTIONAL
     //                           -- If present, version MUST be v3 --  }
     //
-    println!("x: {:?}", x);
     match x {
         &ASN1Block::Sequence(_, _, ref b0) => {
+            println!("b0 {:?}", b0);
             let (version,  b1) = X509Version::from_asn1(b0)?;
-            println!("version: {:?}", version);
             let (serial,   b2) = X509Serial::from_asn1(b1)?;
-            println!("serial: {:?}", serial);
             let (ident,    b3) = AlgorithmIdentifier::from_asn1(b2)?;
-            println!("ident: {:?}", ident);
             let (issuer,   b4) = InfoBlock::from_asn1(b3)?;
-            println!("issuer: {:?}", issuer);
             let (validity, b5) = Validity::from_asn1(b4)?;
-            println!("validity: {:?}", validity);
             let (subject,  b6) = InfoBlock::from_asn1(b5)?;
-            println!("subject: {:?}", subject);
             let (subkey,   b7) = X509PublicKey::from_asn1(b6)?;
-            println!("subkey: {:?}", subkey);
-            println!("REMAINDER: {:?}", b7);
             Ok(Certificate {
                 version: version,
                 serial: serial,
@@ -110,7 +102,6 @@ fn parse_x509(blocks: &[ASN1Block], buffer: &[u8])
             Err(X509ParseError::NotEnoughData),
         Some(&ASN1Block::Sequence(_, _, ref x)) => {
             let cert = decode_certificate(&x[0])?;
-            println!("cert: {:?}", cert);
             Ok(cert)
         }
         Some(_) =>
@@ -157,13 +148,13 @@ mod tests {
         assert!(can_parse("test/dsa3072-1.der").is_ok());
         assert!(can_parse("test/dsa3072-2.der").is_ok());
     }
-
+//
 //    #[test]
-    fn ecc_tests() {
-        assert!(can_parse("test/ec384-1.der").is_ok());
-        assert!(can_parse("test/ec384-2.der").is_ok());
-        assert!(can_parse("test/ec384-3.der").is_ok());
-    }
+//    fn ecc_tests() {
+//        assert!(can_parse("test/ec384-1.der").is_ok());
+//        assert!(can_parse("test/ec384-2.der").is_ok());
+//        assert!(can_parse("test/ec384-3.der").is_ok());
+//    }
 }
 
 /*
@@ -786,7 +777,7 @@ mod tests {
         der_decode(&buffer[..])
     }
 
-    #[test]
+    //#[test]
     fn x509_tests() {
         assert!(can_parse("test/rsa2048-1.der").is_ok());
         assert!(can_parse("test/rsa2048-2.der").is_ok());
diff --git a/src/publickey.rs b/src/publickey.rs
index ba6075e..3940ceb 100644
--- a/src/publickey.rs
+++ b/src/publickey.rs
@@ -17,15 +17,14 @@ impl FromASN1 for X509PublicKey {
     type Error = X509ParseError;
 
     fn from_asn1(bs: &[ASN1Block])
-        -> Result<(X509PublicKey, &[ASN1Block]),X509ParseError>
+        -> Result<(X509PublicKey,&[ASN1Block]),X509ParseError>
     {
         match bs.split_first() {
             None =>
-                Err(X509ParseError::KeyNotFound),
+                Err(X509ParseError::NotEnoughData),
             Some((x, rest)) => {
-                println!("key info: {:?}", x);
-                let v = decode_public_key(&x)?;
-                Ok((v, rest))
+                let res = decode_public_key(&x)?;
+                Ok((res, rest))
             }
         }
     }
@@ -50,16 +49,20 @@ fn decode_public_key(block: &ASN1Block)
     //      subjectPublicKey     BIT STRING  }
     match block {
         &ASN1Block::Sequence(_, _, ref info)  => {
-            let (id, alginfo) = strip_algident(&info[0])?;
+            let (id, malginfo) = strip_algident(&info[0])?;
 
             if id == oid!(1,2,840,113549,1,1,1) {
                 let key = decode_rsa_key(&info[1])?;
                 return Ok(X509PublicKey::RSA(key));
             }
             if id == oid!(1,2,840,10040,4,1) {
-                let params = decode_dsa_info(&alginfo)?;
-                let key = decode_dsa_key(&info[1], &params)?;
-                return Ok(X509PublicKey::DSA(key));
+                if let Some(alginfo) = malginfo {
+                    let params = decode_dsa_info(&alginfo)?;
+                    let key = decode_dsa_key(&info[1], &params)?;
+                    return Ok(X509PublicKey::DSA(key));
+                } else {
+                    return Err(X509ParseError::IllFormedKey)
+                }
             }
             Err(X509ParseError::IllFormedKey)
         }
@@ -69,19 +72,17 @@ fn decode_public_key(block: &ASN1Block)
 }
 
 fn strip_algident(block: &ASN1Block)
-    -> Result<(OID,ASN1Block),X509ParseError>
+    -> Result<(OID, Option<ASN1Block>),X509ParseError>
 {
     match block {
-        &ASN1Block::Sequence(_, _, ref v) if v.len() == 2 => {
-            match v[0] {
-                ASN1Block::ObjectIdentifier(_, _, ref oid) => {
-                    Ok((oid.clone(), v[1].clone()))
-                }
-                _ => Err(X509ParseError::IllFormedAlgoInfo)
-            }
+        &ASN1Block::ObjectIdentifier(_, _, ref oid) => {
+            Ok((oid.clone(), None))
         }
-        _ =>
-            Err(X509ParseError::IllFormedAlgoInfo)
+        &ASN1Block::Sequence(_, _, ref items) => {
+            let (oid, _) = strip_algident(&items[0])?;
+            Ok((oid, Some(items[1].clone())))
+        }
+        _ => Err(X509ParseError::IllFormedAlgoInfo)
     }
 }
 
@@ -130,7 +131,8 @@ fn decode_rsa_key(b: &ASN1Block) -> Result<RSAPublicKey, X509ParseError> {
 fn encode_dsa_key(c: ASN1Class, k: &DSAPublicKey)
     -> Result<ASN1Block, ASN1EncodeErr>
 {
-    unimplemented!()
+    let bstr = der_encode(k)?;
+    Ok(ASN1Block::BitString(c, 0, bstr.len() * 8, bstr))
 }
 
 fn decode_dsa_key(b: &ASN1Block, params: &DSAParameters)
@@ -227,7 +229,7 @@ mod test {
         }
     }
 
-    #[test]
+    // #[test]
     fn dsa_public_key_tests() {
         for _ in 0..NUM_TESTS {
             let params = DSAParameters::generate(DSAParameterSize::L1024N160).unwrap();