From f1b64aa2eefc98630efefed223ae30a1c33d85e0 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 31 Jul 2016 15:59:34 -0700
Subject: [PATCH] Fix weird inference issue on 1.9

---
 openssl/src/crypto/dsa.rs | 14 ++++++++------
 openssl/src/crypto/rsa.rs | 14 ++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/openssl/src/crypto/dsa.rs b/openssl/src/crypto/dsa.rs
index df6c255b..a1e4572a 100644
--- a/openssl/src/crypto/dsa.rs
+++ b/openssl/src/crypto/dsa.rs
@@ -245,6 +245,8 @@ impl fmt::Debug for DSA {
 mod test {
     use std::fs::File;
     use std::io::{Write, Cursor};
+    use libc::c_char;
+
     use super::*;
     use crypto::hash::*;
 
@@ -330,12 +332,12 @@ mod test {
         let mut buffer = File::open("test/dsa-encrypted.pem").unwrap();
         DSA::private_key_from_pem_cb(&mut buffer, |password| {
             password_queried = true;
-            password[0] = b'm' as _;
-            password[1] = b'y' as _;
-            password[2] = b'p' as _;
-            password[3] = b'a' as _;
-            password[4] = b's' as _;
-            password[5] = b's' as _;
+            password[0] = b'm' as c_char;
+            password[1] = b'y' as c_char;
+            password[2] = b'p' as c_char;
+            password[3] = b'a' as c_char;
+            password[4] = b's' as c_char;
+            password[5] = b's' as c_char;
             6
         }).unwrap();
 
diff --git a/openssl/src/crypto/rsa.rs b/openssl/src/crypto/rsa.rs
index cf946d35..05c1c774 100644
--- a/openssl/src/crypto/rsa.rs
+++ b/openssl/src/crypto/rsa.rs
@@ -238,6 +238,8 @@ impl fmt::Debug for RSA {
 mod test {
     use std::fs::File;
     use std::io::Write;
+    use libc::c_char;
+
     use super::*;
     use crypto::hash::*;
 
@@ -301,12 +303,12 @@ mod test {
         let mut buffer = File::open("test/rsa-encrypted.pem").unwrap();
         RSA::private_key_from_pem_cb(&mut buffer, |password| {
             password_queried = true;
-            password[0] = b'm' as _;
-            password[1] = b'y' as _;
-            password[2] = b'p' as _;
-            password[3] = b'a' as _;
-            password[4] = b's' as _;
-            password[5] = b's' as _;
+            password[0] = b'm' as c_char;
+            password[1] = b'y' as c_char;
+            password[2] = b'p' as c_char;
+            password[3] = b'a' as c_char;
+            password[4] = b's' as c_char;
+            password[5] = b's' as c_char;
             6
         }).unwrap();