aboutsummaryrefslogtreecommitdiff
path: root/src/crypto/mod.rs
diff options
context:
space:
mode:
authorChris Cole <[email protected]>2014-11-29 19:47:09 -0500
committerChris Cole <[email protected]>2014-11-29 19:47:09 -0500
commit5f76f1cb62c70af4bbf064ea5c27c69544f04cea (patch)
tree6c90d43f6bfdf1b2b83094c1bfc559bfbdecf554 /src/crypto/mod.rs
parentAdded mod_mul. (diff)
parentMake SslStream Cloneable (diff)
downloadrust-openssl-5f76f1cb62c70af4bbf064ea5c27c69544f04cea.tar.xz
rust-openssl-5f76f1cb62c70af4bbf064ea5c27c69544f04cea.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: src/bn/mod.rs
Diffstat (limited to 'src/crypto/mod.rs')
-rw-r--r--src/crypto/mod.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/crypto/mod.rs b/src/crypto/mod.rs
index d7c62f98..e695de33 100644
--- a/src/crypto/mod.rs
+++ b/src/crypto/mod.rs
@@ -21,3 +21,4 @@ pub mod pkcs5;
pub mod pkey;
pub mod rand;
pub mod symm;
+pub mod memcmp;