aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Ballard <[email protected]>2013-12-05 01:43:37 -0800
committerKevin Ballard <[email protected]>2013-12-05 01:43:37 -0800
commitee4d0b4d2b16ba62f848e017ef8647a1cf19deb2 (patch)
tree946139459b1f5d2ab2574528a30c8b696795c470
parentUpdate for latest master (0.9-pre 90d06ec) (diff)
downloadrust-openssl-ee4d0b4d2b16ba62f848e017ef8647a1cf19deb2.tar.xz
rust-openssl-ee4d0b4d2b16ba62f848e017ef8647a1cf19deb2.zip
Update for latest master (0.9-pre b5bab85)
-rw-r--r--hash.rs2
-rw-r--r--hmac.rs2
-rw-r--r--pkcs5.rs2
-rw-r--r--pkey.rs2
-rw-r--r--rand.rs2
5 files changed, 5 insertions, 5 deletions
diff --git a/hash.rs b/hash.rs
index d7b99264..339aafeb 100644
--- a/hash.rs
+++ b/hash.rs
@@ -22,7 +22,7 @@ mod libcrypto {
use super::*;
use std::libc::c_uint;
- #[link_args = "-lcrypto"]
+ #[link(name = "crypto")]
extern {
pub fn EVP_MD_CTX_create() -> EVP_MD_CTX;
pub fn EVP_MD_CTX_destroy(ctx: EVP_MD_CTX);
diff --git a/hmac.rs b/hmac.rs
index 8e533f53..fc48b33d 100644
--- a/hmac.rs
+++ b/hmac.rs
@@ -27,7 +27,7 @@ pub struct HMAC_CTX {
key: [libc::c_uchar, ..128]
}
-#[link_args = "-lcrypto"]
+#[link(name = "crypto")]
extern {
fn HMAC_CTX_init(ctx: *mut HMAC_CTX, key: *u8, keylen: libc::c_int, md: EVP_MD);
diff --git a/pkcs5.rs b/pkcs5.rs
index 71c7e590..b7c83a3f 100644
--- a/pkcs5.rs
+++ b/pkcs5.rs
@@ -4,7 +4,7 @@ use std::vec;
mod libcrypto {
use std::libc::c_int;
- #[link_args = "-lcrypto"]
+ #[link(name = "crypto")]
extern {
pub fn PKCS5_PBKDF2_HMAC_SHA1(pass: *u8, passlen: c_int,
salt: *u8, saltlen: c_int,
diff --git a/pkey.rs b/pkey.rs
index 41996c65..7b5245b2 100644
--- a/pkey.rs
+++ b/pkey.rs
@@ -15,7 +15,7 @@ mod libcrypto {
use super::*;
use std::libc::{c_char, c_int, c_uint};
- #[link_args = "-lcrypto"]
+ #[link(name = "crypto")]
extern {
pub fn EVP_PKEY_new() -> *EVP_PKEY;
pub fn EVP_PKEY_free(k: *EVP_PKEY);
diff --git a/rand.rs b/rand.rs
index f8dd25b4..8e78c51c 100644
--- a/rand.rs
+++ b/rand.rs
@@ -4,7 +4,7 @@ use std::vec;
mod libcrypto {
use std::libc::c_int;
- #[link_args = "-lcrypto"]
+ #[link(name = "crypto")]
extern {
pub fn RAND_bytes(buf: *mut u8, num: c_int) -> c_int;
}