Rustfmt (1b075740) · Commits · Public Repositories / Rust Openssl

openssl/src/crypto/hmac.rs

+1 −2

Original line number	Diff line number	Diff line
		@@ -387,8 +387,7 @@ mod tests {
		let tests: [(Vec<u8>, Vec<u8>); 6] =
		[(repeat(0xb_u8).take(20).collect(), b"Hi There".to_vec()),
		(b"Jefe".to_vec(), b"what do ya want for nothing?".to_vec()),
		(repeat(0xaa_u8).take(20).collect(),
		repeat(0xdd_u8).take(50).collect()),
		(repeat(0xaa_u8).take(20).collect(), repeat(0xdd_u8).take(50).collect()),
		("0102030405060708090a0b0c0d0e0f10111213141516171819".from_hex().unwrap(),
		repeat(0xcd_u8).take(50).collect()),
		(repeat(0xaa_u8).take(131).collect(),

openssl/src/crypto/pkey.rs

+10 −11

Original line number	Diff line number	Diff line
		@@ -604,12 +604,11 @@ impl Clone for PKey {
		match self.parts {
		Parts::Public => {
		pkey.load_pub(&self.save_pub()[..]);
		},
		}
		Parts::Both => {
		pkey.load_priv(&self.save_priv()[..]);
		},
		Parts::Neither => {
		},
		}
		Parts::Neither => {}
		}
		pkey
		}

openssl/src/crypto/rsa.rs

+105 −105

Original line number	Diff line number	Diff line
		@@ -32,7 +32,15 @@ impl RSA {
		}
		}

		pub fn from_private_components(n: BigNum, e: BigNum, d: BigNum, p: BigNum, q: BigNum, dp: BigNum, dq: BigNum, qi: BigNum) -> Result<RSA, SslError> {
		pub fn from_private_components(n: BigNum,
		e: BigNum,
		d: BigNum,
		p: BigNum,
		q: BigNum,
		dp: BigNum,
		dq: BigNum,
		qi: BigNum)
		-> Result<RSA, SslError> {
		unsafe {
		let rsa = try_ssl_null!(ffi::RSA_new());
		(*rsa).n = n.into_raw();
		@@ -75,7 +83,13 @@ impl RSA {
		let mut mem_bio = try!(MemBio::new());

		let result = unsafe {
		ffi::PEM_write_bio_RSAPrivateKey(mem_bio.get_handle(), self.0, ptr::null(), ptr::null_mut(), 0, None, ptr::null_mut())
		ffi::PEM_write_bio_RSAPrivateKey(mem_bio.get_handle(),
		self.0,
		ptr::null(),
		ptr::null_mut(),
		0,
		None,
		ptr::null_mut())
		};

		if result == 1 {
		@@ -109,9 +123,7 @@ impl RSA {
		{
		let mut mem_bio = try!(MemBio::new());

		let result = unsafe {
		ffi::PEM_write_bio_RSA_PUBKEY(mem_bio.get_handle(), self.0)
		};
		let result = unsafe { ffi::PEM_write_bio_RSA_PUBKEY(mem_bio.get_handle(), self.0) };

		if result == 1 {
		try!(io::copy(&mut mem_bio, writer).map_err(StreamError));
		@@ -124,9 +136,7 @@ impl RSA {

		pub fn size(&self) -> Result<u32, SslError> {
		if self.has_n() {
		unsafe {
		Ok(ffi::RSA_size(self.0) as u32)
		}
		unsafe { Ok(ffi::RSA_size(self.0) as u32) }
		} else {
		Err(SslError::OpenSslErrors(vec![]))
		}
		@@ -138,7 +148,12 @@ impl RSA {
		let mut sig_len = k_len;

		unsafe {
		let result = ffi::RSA_sign(hash.as_nid() as c_int, message.as_ptr(), message.len() as u32, sig.as_mut_ptr(), &mut sig_len, self.0);
		let result = ffi::RSA_sign(hash.as_nid() as c_int,
		message.as_ptr(),
		message.len() as u32,
		sig.as_mut_ptr(),
		&mut sig_len,
		self.0);
		assert!(sig_len == k_len);

		if result == 1 {
		@@ -151,7 +166,12 @@ impl RSA {

		pub fn verify(&self, hash: hash::Type, message: &[u8], sig: &[u8]) -> Result<bool, SslError> {
		unsafe {
		let result = ffi::RSA_verify(hash.as_nid() as c_int, message.as_ptr(), message.len() as u32, sig.as_ptr(), sig.len() as u32, self.0);
		let result = ffi::RSA_verify(hash.as_nid() as c_int,
		message.as_ptr(),
		message.len() as u32,
		sig.as_ptr(),
		sig.len() as u32,
		self.0);

		Ok(result == 1)
		}
		@@ -163,45 +183,31 @@ impl RSA {

		// The following getters are unsafe, since BigNum::new_from_ffi fails upon null pointers
		pub fn n(&self) -> Result<BigNum, SslError> {
		unsafe {
		BigNum::new_from_ffi((*self.0).n)
		}
		unsafe { BigNum::new_from_ffi((*self.0).n) }
		}

		pub fn has_n(&self) -> bool {
		unsafe {
		!(*self.0).n.is_null()
		}
		unsafe { !(*self.0).n.is_null() }
		}

		pub fn d(&self) -> Result<BigNum, SslError> {
		unsafe {
		BigNum::new_from_ffi((*self.0).d)
		}
		unsafe { BigNum::new_from_ffi((*self.0).d) }
		}

		pub fn e(&self) -> Result<BigNum, SslError> {
		unsafe {
		BigNum::new_from_ffi((*self.0).e)
		}
		unsafe { BigNum::new_from_ffi((*self.0).e) }
		}

		pub fn has_e(&self) -> bool {
		unsafe {
		!(*self.0).e.is_null()
		}
		unsafe { !(*self.0).e.is_null() }
		}

		pub fn p(&self) -> Result<BigNum, SslError> {
		unsafe {
		BigNum::new_from_ffi((*self.0).p)
		}
		unsafe { BigNum::new_from_ffi((*self.0).p) }
		}

		pub fn q(&self) -> Result<BigNum, SslError> {
		unsafe {
		BigNum::new_from_ffi((*self.0).q)
		}
		unsafe { BigNum::new_from_ffi((*self.0).q) }
		}
		}

		@@ -219,35 +225,29 @@ mod test {
		use crypto::hash::*;

		fn signing_input_rs256() -> Vec<u8> {
		vec![101, 121, 74, 104, 98, 71, 99, 105, 79, 105, 74, 83, 85, 122, 73,
		49, 78, 105, 74, 57, 46, 101, 121, 74, 112, 99, 51, 77, 105, 79, 105,
		74, 113, 98, 50, 85, 105, 76, 65, 48, 75, 73, 67, 74, 108, 101, 72,
		65, 105, 79, 106, 69, 122, 77, 68, 65, 52, 77, 84, 107, 122, 79, 68,
		65, 115, 68, 81, 111, 103, 73, 109, 104, 48, 100, 72, 65, 54, 76,
		121, 57, 108, 101, 71, 70, 116, 99, 71, 120, 108, 76, 109, 78, 118,
		98, 83, 57, 112, 99, 49, 57, 121, 98, 50, 57, 48, 73, 106, 112, 48,
		99, 110, 86, 108, 102, 81]
		vec![101, 121, 74, 104, 98, 71, 99, 105, 79, 105, 74, 83, 85, 122, 73, 49, 78, 105, 74, 57,
		46, 101, 121, 74, 112, 99, 51, 77, 105, 79, 105, 74, 113, 98, 50, 85, 105, 76, 65, 48,
		75, 73, 67, 74, 108, 101, 72, 65, 105, 79, 106, 69, 122, 77, 68, 65, 52, 77, 84, 107,
		122, 79, 68, 65, 115, 68, 81, 111, 103, 73, 109, 104, 48, 100, 72, 65, 54, 76, 121,
		57, 108, 101, 71, 70, 116, 99, 71, 120, 108, 76, 109, 78, 118, 98, 83, 57, 112, 99,
		49, 57, 121, 98, 50, 57, 48, 73, 106, 112, 48, 99, 110, 86, 108, 102, 81]
		}

		fn signature_rs256() -> Vec<u8> {
		vec![112, 46, 33, 137, 67, 232, 143, 209, 30, 181, 216, 45, 191, 120, 69,
		243, 65, 6, 174, 27, 129, 255, 247, 115, 17, 22, 173, 209, 113, 125,
		131, 101, 109, 66, 10, 253, 60, 150, 238, 221, 115, 162, 102, 62, 81,
		102, 104, 123, 0, 11, 135, 34, 110, 1, 135, 237, 16, 115, 249, 69,
		229, 130, 173, 252, 239, 22, 216, 90, 121, 142, 232, 198, 109, 219,
		61, 184, 151, 91, 23, 208, 148, 2, 190, 237, 213, 217, 217, 112, 7,
		16, 141, 178, 129, 96, 213, 248, 4, 12, 167, 68, 87, 98, 184, 31,
		190, 127, 249, 217, 46, 10, 231, 111, 36, 242, 91, 51, 187, 230, 244,
		74, 230, 30, 177, 4, 10, 203, 32, 4, 77, 62, 249, 18, 142, 212, 1,
		48, 121, 91, 212, 189, 59, 65, 238, 202, 208, 102, 171, 101, 25, 129,
		253, 228, 141, 247, 127, 55, 45, 195, 139, 159, 175, 221, 59, 239,
		177, 139, 93, 163, 204, 60, 46, 176, 47, 158, 58, 65, 214, 18, 202,
		173, 21, 145, 18, 115, 160, 95, 35, 185, 232, 56, 250, 175, 132, 157,
		105, 132, 41, 239, 90, 30, 136, 121, 130, 54, 195, 212, 14, 96, 69,
		34, 165, 68, 200, 242, 122, 122, 45, 184, 6, 99, 209, 108, 247, 202,
		234, 86, 222, 64, 92, 178, 33, 90, 69, 178, 194, 85, 102, 181, 90,
		193, 167, 72, 160, 112, 223, 200, 163, 42, 70, 149, 67, 208, 25, 238,
		251, 71]
		vec![112, 46, 33, 137, 67, 232, 143, 209, 30, 181, 216, 45, 191, 120, 69, 243, 65, 6, 174,
		27, 129, 255, 247, 115, 17, 22, 173, 209, 113, 125, 131, 101, 109, 66, 10, 253, 60,
		150, 238, 221, 115, 162, 102, 62, 81, 102, 104, 123, 0, 11, 135, 34, 110, 1, 135, 237,
		16, 115, 249, 69, 229, 130, 173, 252, 239, 22, 216, 90, 121, 142, 232, 198, 109, 219,
		61, 184, 151, 91, 23, 208, 148, 2, 190, 237, 213, 217, 217, 112, 7, 16, 141, 178, 129,
		96, 213, 248, 4, 12, 167, 68, 87, 98, 184, 31, 190, 127, 249, 217, 46, 10, 231, 111,
		36, 242, 91, 51, 187, 230, 244, 74, 230, 30, 177, 4, 10, 203, 32, 4, 77, 62, 249, 18,
		142, 212, 1, 48, 121, 91, 212, 189, 59, 65, 238, 202, 208, 102, 171, 101, 25, 129,
		253, 228, 141, 247, 127, 55, 45, 195, 139, 159, 175, 221, 59, 239, 177, 139, 93, 163,
		204, 60, 46, 176, 47, 158, 58, 65, 214, 18, 202, 173, 21, 145, 18, 115, 160, 95, 35,
		185, 232, 56, 250, 175, 132, 157, 105, 132, 41, 239, 90, 30, 136, 121, 130, 54, 195,
		212, 14, 96, 69, 34, 165, 68, 200, 242, 122, 122, 45, 184, 6, 99, 209, 108, 247, 202,
		234, 86, 222, 64, 92, 178, 33, 90, 69, 178, 194, 85, 102, 181, 90, 193, 167, 72, 160,
		112, 223, 200, 163, 42, 70, 149, 67, 208, 25, 238, 251, 71]
		}

		#[test]

openssl/src/nid.rs

+1 −4

Original line number	Diff line number	Diff line
		@@ -186,12 +186,9 @@ pub enum Nid {
		OCSPSigning, // 180

		// 181 and up are from openssl's obj_mac.h


		/// Shown as UID in cert subject
		UserId = 458,


		SHA256 = 672,
		SHA384,
		SHA512,

openssl/src/ssl/bio.rs

+18 −13

Original line number	Diff line number	Diff line
		@@ -82,12 +82,16 @@ unsafe fn state<'a, S: 'a>(bio: *mut BIO) -> &'a mut StreamState<S> {
		}

		#[cfg(feature = "nightly")]
		fn catch_unwind<F, T>(f: F) -> Result<T, Box<Any + Send>> where F: FnOnce() -> T {
		fn catch_unwind<F, T>(f: F) -> Result<T, Box<Any + Send>>
		where F: FnOnce() -> T
		{
		::std::panic::catch_unwind(::std::panic::AssertUnwindSafe(f))
		}

		#[cfg(not(feature = "nightly"))]
		fn catch_unwind<F, T>(f: F) -> Result<T, Box<Any + Send>> where F: FnOnce() -> T {
		fn catch_unwind<F, T>(f: F) -> Result<T, Box<Any + Send>>
		where F: FnOnce() -> T
		{
		Ok(f())
		}

		@@ -137,7 +141,8 @@ unsafe extern "C" fn bread<S: Read>(bio: mut BIO, buf: mut c_char, len: c_int)

		fn retriable_error(err: &io::Error) -> bool {
		match err.kind() {
		io::ErrorKind::WouldBlock \| io::ErrorKind::NotConnected => true,
		io::ErrorKind::WouldBlock \|
		io::ErrorKind::NotConnected => true,
		_ => false,
		}
		}