aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Ballard <[email protected]>2013-08-14 17:55:18 -0700
committerKevin Ballard <[email protected]>2013-08-14 17:55:18 -0700
commitb78636fa47cc13cf19a7550ab47eb8030f6d5505 (patch)
tree091931cf5abb16f9d00db2a282884df76b0baab0
parentMerge pull request #1 from miloshadzic/master (diff)
downloadrust-openssl-b78636fa47cc13cf19a7550ab47eb8030f6d5505.tar.xz
rust-openssl-b78636fa47cc13cf19a7550ab47eb8030f6d5505.zip
Update to latest rust master (0.8-pre 927aff1)
-rw-r--r--pkey.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkey.rs b/pkey.rs
index 05832d02..31439bf3 100644
--- a/pkey.rs
+++ b/pkey.rs
@@ -100,7 +100,7 @@ pub fn PKey() -> PKey {
///Represents a public key, optionally with a private key attached.
impl PKey {
- priv unsafe fn _tostr(&self, f: extern "C" unsafe fn(*EVP_PKEY, &*mut u8) -> c_int) -> ~[u8] {
+ unsafe fn _tostr(&self, f: extern "C" unsafe fn(*EVP_PKEY, &*mut u8) -> c_int) -> ~[u8] {
let buf = ptr::mut_null();
let len = f(self.evp, &buf);
if len < 0 as c_int { return ~[]; }
@@ -113,7 +113,7 @@ impl PKey {
s.slice(0u, r as uint).to_owned()
}
- priv unsafe fn _fromstr(
+ unsafe fn _fromstr(
&mut self,
s: &[u8],
f: extern "C" unsafe fn(c_int, &*EVP_PKEY, &*u8, c_uint) -> *EVP_PKEY