aboutsummaryrefslogtreecommitdiff
path: root/openssl/src
diff options
context:
space:
mode:
Diffstat (limited to 'openssl/src')
-rw-r--r--openssl/src/crypto/pkey.rs26
-rw-r--r--openssl/src/crypto/symm.rs73
-rw-r--r--openssl/src/crypto/symm_internal.rs8
-rw-r--r--openssl/src/lib.rs2
-rw-r--r--openssl/src/ssl/mod.rs10
5 files changed, 117 insertions, 2 deletions
diff --git a/openssl/src/crypto/pkey.rs b/openssl/src/crypto/pkey.rs
index 5a528b1b..695bd8a6 100644
--- a/openssl/src/crypto/pkey.rs
+++ b/openssl/src/crypto/pkey.rs
@@ -96,6 +96,22 @@ impl PKey {
}
}
+ /// Reads public key from PEM, takes ownership of handle
+ pub fn public_key_from_pem<R>(reader: &mut R) -> Result<PKey, SslError> where R: Read {
+ let mut mem_bio = try!(MemBio::new());
+ try!(io::copy(reader, &mut mem_bio).map_err(StreamError));
+
+ unsafe {
+ let evp = try_ssl_null!(ffi::PEM_read_bio_PUBKEY(mem_bio.get_handle(),
+ ptr::null_mut(),
+ None, ptr::null_mut()));
+ Ok(PKey {
+ evp: evp,
+ parts: Parts::Public,
+ })
+ }
+ }
+
fn _tostr(&self, f: unsafe extern "C" fn(*mut ffi::RSA, *const *mut u8) -> c_int) -> Vec<u8> {
unsafe {
let rsa = ffi::EVP_PKEY_get1_RSA(self.evp);
@@ -467,6 +483,16 @@ mod tests {
}
#[test]
+ fn test_public_key_from_pem() {
+ let key_path = Path::new("test/key.pem.pub");
+ let mut file = File::open(&key_path)
+ .ok()
+ .expect("Failed to open `test/key.pem.pub`");
+
+ super::PKey::public_key_from_pem(&mut file).unwrap();
+ }
+
+ #[test]
fn test_encrypt() {
let mut k0 = super::PKey::new();
let mut k1 = super::PKey::new();
diff --git a/openssl/src/crypto/symm.rs b/openssl/src/crypto/symm.rs
index 226b2cbf..db8aa54e 100644
--- a/openssl/src/crypto/symm.rs
+++ b/openssl/src/crypto/symm.rs
@@ -22,6 +22,9 @@ pub enum Type {
#[cfg(feature = "aes_ctr")]
AES_128_CTR,
//AES_128_GCM,
+ AES_128_CFB1,
+ AES_128_CFB128,
+ AES_128_CFB8,
AES_256_ECB,
AES_256_CBC,
@@ -31,6 +34,9 @@ pub enum Type {
#[cfg(feature = "aes_ctr")]
AES_256_CTR,
//AES_256_GCM,
+ AES_256_CFB1,
+ AES_256_CFB128,
+ AES_256_CFB8,
RC4_128,
}
@@ -292,4 +298,71 @@ mod tests {
cipher_test(super::AES_128_GCM, pt, ct, key, iv);
}*/
+
+ #[test]
+ fn test_aes128_cfb1() {
+ // Lifted from http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
+
+ let pt = "6bc1";
+ let ct = "68b3";
+ let key = "2b7e151628aed2a6abf7158809cf4f3c";
+ let iv = "000102030405060708090a0b0c0d0e0f";
+
+ cipher_test(super::Type::AES_128_CFB1, pt, ct, key, iv);
+ }
+
+ #[test]
+ fn test_aes128_cfb128() {
+
+ let pt = "6bc1bee22e409f96e93d7e117393172a";
+ let ct = "3b3fd92eb72dad20333449f8e83cfb4a";
+ let key = "2b7e151628aed2a6abf7158809cf4f3c";
+ let iv = "000102030405060708090a0b0c0d0e0f";
+
+ cipher_test(super::Type::AES_128_CFB128, pt, ct, key, iv);
+ }
+
+ #[test]
+ fn test_aes128_cfb8() {
+
+ let pt = "6bc1bee22e409f96e93d7e117393172aae2d";
+ let ct = "3b79424c9c0dd436bace9e0ed4586a4f32b9";
+ let key = "2b7e151628aed2a6abf7158809cf4f3c";
+ let iv = "000102030405060708090a0b0c0d0e0f";
+
+ cipher_test(super::Type::AES_128_CFB8, pt, ct, key, iv);
+ }
+
+ #[test]
+ fn test_aes256_cfb1() {
+
+ let pt = "6bc1";
+ let ct = "9029";
+ let key = "603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4";
+ let iv = "000102030405060708090a0b0c0d0e0f";
+
+ cipher_test(super::Type::AES_256_CFB1, pt, ct, key, iv);
+ }
+
+ #[test]
+ fn test_aes256_cfb128() {
+
+ let pt = "6bc1bee22e409f96e93d7e117393172a";
+ let ct = "dc7e84bfda79164b7ecd8486985d3860";
+ let key = "603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4";
+ let iv = "000102030405060708090a0b0c0d0e0f";
+
+ cipher_test(super::Type::AES_256_CFB128, pt, ct, key, iv);
+ }
+
+ #[test]
+ fn test_aes256_cfb8() {
+
+ let pt = "6bc1bee22e409f96e93d7e117393172aae2d";
+ let ct = "dc1f1a8520a64db55fcc8ac554844e889700";
+ let key = "603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4";
+ let iv = "000102030405060708090a0b0c0d0e0f";
+
+ cipher_test(super::Type::AES_256_CFB8, pt, ct, key, iv);
+ }
}
diff --git a/openssl/src/crypto/symm_internal.rs b/openssl/src/crypto/symm_internal.rs
index c42efb79..fcb3ee71 100644
--- a/openssl/src/crypto/symm_internal.rs
+++ b/openssl/src/crypto/symm_internal.rs
@@ -11,6 +11,9 @@ pub fn evpc(t: symm::Type) -> (*const ffi::EVP_CIPHER, u32, u32) {
#[cfg(feature = "aes_ctr")]
symm::Type::AES_128_CTR => (ffi::EVP_aes_128_ctr(), 16, 0),
//AES_128_GCM => (EVP_aes_128_gcm(), 16, 16),
+ symm::Type::AES_128_CFB1 => (ffi::EVP_aes_128_cfb1(), 16, 16),
+ symm::Type::AES_128_CFB128 => (ffi::EVP_aes_128_cfb128(), 16, 16),
+ symm::Type::AES_128_CFB8 => (ffi::EVP_aes_128_cfb8(), 16, 16),
symm::Type::AES_256_ECB => (ffi::EVP_aes_256_ecb(), 32, 16),
symm::Type::AES_256_CBC => (ffi::EVP_aes_256_cbc(), 32, 16),
@@ -19,8 +22,11 @@ pub fn evpc(t: symm::Type) -> (*const ffi::EVP_CIPHER, u32, u32) {
#[cfg(feature = "aes_ctr")]
symm::Type::AES_256_CTR => (ffi::EVP_aes_256_ctr(), 32, 0),
//AES_256_GCM => (EVP_aes_256_gcm(), 32, 16),
+ symm::Type::AES_256_CFB1 => (ffi::EVP_aes_256_cfb1(), 32, 16),
+ symm::Type::AES_256_CFB128 => (ffi::EVP_aes_256_cfb128(), 32, 16),
+ symm::Type::AES_256_CFB8 => (ffi::EVP_aes_256_cfb8(), 32, 16),
symm::Type::RC4_128 => (ffi::EVP_rc4(), 16, 0),
}
}
-} \ No newline at end of file
+}
diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs
index 5a3b215f..c7af3113 100644
--- a/openssl/src/lib.rs
+++ b/openssl/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.6.6")]
+#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.6.7")]
#[macro_use]
extern crate bitflags;
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index 360f3f3e..e76529a5 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -520,6 +520,16 @@ impl SslContext {
})
}
+ /// Specifies the file that contains certificate chain
+ pub fn set_certificate_chain_file<P: AsRef<Path>>(&mut self, file: P, file_type: X509FileType)
+ -> Result<(),SslError> {
+ let file = CString::new(file.as_ref().as_os_str().to_str().expect("invalid utf8")).unwrap();
+ wrap_ssl_result(
+ unsafe {
+ ffi::SSL_CTX_use_certificate_chain_file(self.ctx, file.as_ptr(), file_type as c_int)
+ })
+ }
+
/// Specifies the certificate
pub fn set_certificate(&mut self, cert: &X509) -> Result<(),SslError> {
wrap_ssl_result(
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-11 10:45:35 +0000