min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix weird inference issue on 1.9

This commit is contained in:
Steven Fackler 2016-07-31 15:59:34 -07:00
parent 6f40b65d2c
commit f1b64aa2ee
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openssl/src/crypto/dsa.rs
View File

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

14
openssl/src/crypto/rsa.rs
View File

@ -238,6 +238,8 @@ impl fmt::Debug for RSA {
mod test { mod test {
use std::fs::File; use std::fs::File;
use std::io::Write; use std::io::Write;
use libc::c_char;
use super::*; use super::*;
use crypto::hash::*; use crypto::hash::*;
@ -301,12 +303,12 @@ mod test {
let mut buffer = File::open("test/rsa-encrypted.pem").unwrap(); let mut buffer = File::open("test/rsa-encrypted.pem").unwrap();
RSA::private_key_from_pem_cb(&mut buffer, |password| { RSA::private_key_from_pem_cb(&mut buffer, |password| {
password_queried = true; password_queried = true;
password[0] = b'm' as _; password[0] = b'm' as c_char;
password[1] = b'y' as _; password[1] = b'y' as c_char;
password[2] = b'p' as _; password[2] = b'p' as c_char;
password[3] = b'a' as _; password[3] = b'a' as c_char;
password[4] = b's' as _; password[4] = b's' as c_char;
password[5] = b's' as _; password[5] = b's' as c_char;
6 6
}).unwrap(); }).unwrap();