From 06cbbd2b171d9125605fd938ddd4c6b9fb58d8e7 Mon Sep 17 00:00:00 2001
From: Dustin Frisch <fooker@lab.sh>
Date: Wed, 20 Jun 2018 00:40:42 +0200
Subject: [PATCH 1/2] Add Cred::ssh_key_from_memory

---
 src/cred.rs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/cred.rs b/src/cred.rs
index 5de8cf22f1..24470c80d8 100644
--- a/src/cred.rs
+++ b/src/cred.rs
@@ -68,6 +68,24 @@ impl Cred {
         }
     }
 
+    /// Create a new ssh key credential object reading the keys from memory.
+    pub fn ssh_key_from_memory(username: &str,
+                               publickey: Option<&str>,
+                               privatekey: &str,
+                               passphrase: Option<&str>) -> Result<Cred, Error> {
+        ::init();
+        let username = try!(CString::new(username));
+        let publickey = try!(::opt_cstr(publickey));
+        let privatekey = try!(CString::new(privatekey));
+        let passphrase = try!(::opt_cstr(passphrase));
+        let mut out = ptr::null_mut();
+        unsafe {
+            try_call!(raw::git_cred_ssh_key_memory_new(&mut out, username, publickey,
+                                                       privatekey, passphrase));
+            Ok(Binding::from_raw(out))
+        }
+    }
+
     /// Create a new plain-text username and password credential object.
     pub fn userpass_plaintext(username: &str,
                               password: &str) -> Result<Cred, Error> {

From 9335c76b67ea3c445ade0d554459da53c8736ded Mon Sep 17 00:00:00 2001
From: Dustin Frisch <fooker@lab.sh>
Date: Mon, 2 Jul 2018 23:04:06 +0200
Subject: [PATCH 2/2] fixup! Add Cred::ssh_key_from_memory

---
 src/cred.rs | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/src/cred.rs b/src/cred.rs
index 24470c80d8..29d514885a 100644
--- a/src/cred.rs
+++ b/src/cred.rs
@@ -522,6 +522,48 @@ echo username=c
                 .execute().is_none());
     }
 
+    #[test]
+    fn ssh_key_from_memory() {
+        let cred = Cred::ssh_key_from_memory(
+            "test",
+            Some("ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDByAO8uj+kXicj6C2ODMspgmUoVyl5eaw8vR6a1yEnFuJFzevabNlN6Ut+CPT3TRnYk5BW73pyXBtnSL2X95BOnbjMDXc4YIkgs3YYHWnxbqsD4Pj/RoGqhf+gwhOBtL0poh8tT8WqXZYxdJQKLQC7oBqf3ykCEYulE4oeRUmNh4IzEE+skD/zDkaJ+S1HRD8D8YCiTO01qQnSmoDFdmIZTi8MS8Cw+O/Qhym1271ThMlhD6PubSYJXfE6rVbE7A9RzH73A6MmKBlzK8VTb4SlNSrr/DOk+L0uq+wPkv+pm+D9WtxoqQ9yl6FaK1cPawa3+7yRNle3m+72KCtyMkQv"),
+            r#"
+                -----BEGIN RSA PRIVATE KEY-----
+                Proc-Type: 4,ENCRYPTED
+                DEK-Info: AES-128-CBC,818C7722D3B01F2161C2ACF6A5BBAAE8
+                
+                3Cht4QB3PcoQ0I55j1B3m2ZzIC/mrh+K5nQeA1Vy2GBTMyM7yqGHqTOv7qLhJscd
+                H+cB0Pm6yCr3lYuNrcKWOCUto+91P7ikyARruHVwyIxKdNx15uNulOzQJHQWNbA4
+                RQHlhjON4atVo2FyJ6n+ujK6QiBg2PR5Vbbw/AtV6zBCFW3PhzDn+qqmHjpBFqj2
+                vZUUe+MkDQcaF5J45XMHahhSdo/uKCDhfbylExp/+ACWkvxdPpsvcARM6X434ucD
+                aPY+4i0/JyLkdbm0GFN9/q3i53qf4kCBhojFl4AYJdGI0AzAgbdTXZ7EJHbAGZHS
+                os5K0oTwDVXMI0sSE2I/qHxaZZsDP1dOKq6di6SFPUp8liYimm7rNintRX88Gl2L
+                g1ko9abp/NlgD0YY/3mad+NNAISDL/YfXq2fklH3En3/7ZrOVZFKfZXwQwas5g+p
+                VQPKi3+ae74iOjLyuPDSc1ePmhUNYeP+9rLSc0wiaiHqls+2blPPDxAGMEo63kbz
+                YPVjdmuVX4VWnyEsfTxxJdFDYGSNh6rlrrO1RFrex7kJvpg5gTX4M/FT8TfCd7Hn
+                M6adXsLMqwu5tz8FuDmAtVdq8zdSrgZeAbpJ9D3EDOmZ70xz4XBL19ImxDp+Qqs2
+                kQX7kobRzeeP2URfRoGr7XZikQWyQ2UASfPcQULY8R58QoZWWsQ4w51GZHg7TDnw
+                1DRo/0OgkK7Gqf215nFmMpB4uyi58cq3WFwWQa1IqslkObpVgBQZcNZb/hKUYPGk
+                g4zehfIgAfCdnQHwZvQ6Fdzhcs3SZeO+zVyuiZN3Gsi9HU0/1vpAKiuuOzcG02vF
+                b6Y6hwsAA9yphF3atI+ARD4ZwXdDfzuGb3yJglMT3Fr/xuLwAvdchRo1spANKA0E
+                tT5okLrK0H4wnHvf2SniVVWRhmJis0lQo9LjGGwRIdsPpVnJSDvaISIVF+fHT90r
+                HvxN8zXI93x9jcPtwp7puQ1C7ehKJK10sZ71OLIZeuUgwt+5DRunqg6evPco9Go7
+                UOGwcVhLY200KT+1k7zWzCS0yVQp2HRm6cxsZXAp4ClBSwIx15eIoLIrjZdJRjCq
+                COp6pZx1fnvJ9ERIvl5hon+Ty+renMcFKz2HmchC7egpcqIxW9Dsv6zjhHle6pxb
+                37GaEKHF2KA3RN+dSV/K8n+C9Yent5tx5Y9a/pMcgRGtgu+G+nyFmkPKn5Zt39yX
+                qDpyM0LtbRVZPs+MgiqoGIwYc/ujoCq7GL38gezsBQoHaTt79yYBqCp6UR0LMuZ5
+                f/7CtWqffgySfJ/0wjGidDAumDv8CK45AURpL/Z+tbFG3M9ar/LZz/Y6EyBcLtGY
+                Wwb4zs8zXIA0qHrjNTnPqHDvezziArYfgPjxCIHMZzms9Yn8+N02p39uIytqg434
+                BAlCqZ7GYdDFfTpWIwX+segTK9ux0KdBqcQv+9Fwwjkq9KySnRKqNl7ZJcefFZJq
+                c6PA1iinZWBjuaO1HKx3PFulrl0bcpR9Kud1ZIyfnh5rwYN8UQkkcR/wZPla04TY
+                8l5dq/LI/3G5sZXwUHKOcuQWTj7Saq7Q6gkKoMfqt0wC5bpZ1m17GHPoMz6GtX9O
+                -----END RSA PRIVATE KEY-----
+            "#,
+            Some("test123"));
+        assert!(cred.is_ok());
+    }
+    
+
     #[cfg(unix)]
     fn chmod(path: &Path) {
         use std::os::unix::prelude::*;