diff options
| author | Steven Fackler <[email protected]> | 2014-03-31 23:39:13 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2014-03-31 23:39:13 -0700 |
| commit | 7d3133104d95f9020f0db4a84115733140af8bfd (patch) | |
| tree | 382a3304d97bdfa05aa923f4eb1db870ced15c04 | |
| parent | Update to new inner attribute syntax (diff) | |
| download | rust-openssl-7d3133104d95f9020f0db4a84115733140af8bfd.tar.xz rust-openssl-7d3133104d95f9020f0db4a84115733140af8bfd.zip | |
Update for visibility reform
| -rw-r--r-- | crypto/hash.rs | 6 | ||||
| -rw-r--r-- | crypto/hmac.rs | 4 | ||||
| -rw-r--r-- | crypto/pkey.rs | 4 | ||||
| -rw-r--r-- | crypto/symm.rs | 8 | ||||
| -rw-r--r-- | ssl/mod.rs | 18 |
5 files changed, 20 insertions, 20 deletions
diff --git a/crypto/hash.rs b/crypto/hash.rs index c4d27a7a..60a98e98 100644 --- a/crypto/hash.rs +++ b/crypto/hash.rs @@ -49,9 +49,9 @@ pub fn evpmd(t: HashType) -> (EVP_MD, uint) { } pub struct Hasher { - priv evp: EVP_MD, - priv ctx: EVP_MD_CTX, - priv len: uint, + evp: EVP_MD, + ctx: EVP_MD_CTX, + len: uint, } impl Hasher { diff --git a/crypto/hmac.rs b/crypto/hmac.rs index 2056dc09..17993bfe 100644 --- a/crypto/hmac.rs +++ b/crypto/hmac.rs @@ -37,8 +37,8 @@ extern { } pub struct HMAC { - priv ctx: HMAC_CTX, - priv len: uint, + ctx: HMAC_CTX, + len: uint, } pub fn HMAC(ht: hash::HashType, key: ~[u8]) -> HMAC { diff --git a/crypto/pkey.rs b/crypto/pkey.rs index b4b910bc..abe764dd 100644 --- a/crypto/pkey.rs +++ b/crypto/pkey.rs @@ -75,8 +75,8 @@ fn openssl_hash_nid(hash: HashType) -> c_int { } pub struct PKey { - priv evp: *EVP_PKEY, - priv parts: Parts, + evp: *EVP_PKEY, + parts: Parts, } /// Represents a public key, optionally with a private key attached. diff --git a/crypto/symm.rs b/crypto/symm.rs index 949cb2da..008f777a 100644 --- a/crypto/symm.rs +++ b/crypto/symm.rs @@ -73,10 +73,10 @@ fn evpc(t: Type) -> (EVP_CIPHER, uint, uint) { /// Represents a symmetric cipher context. pub struct Crypter { - priv evp: EVP_CIPHER, - priv ctx: EVP_CIPHER_CTX, - priv keylen: uint, - priv blocksize: uint + evp: EVP_CIPHER, + ctx: EVP_CIPHER_CTX, + keylen: uint, + blocksize: uint } impl Crypter { @@ -139,7 +139,7 @@ pub type VerifyCallback = fn(preverify_ok: bool, /// An SSL context object pub struct SslContext { - priv ctx: *ffi::SSL_CTX + ctx: *ffi::SSL_CTX } impl Drop for SslContext { @@ -196,7 +196,7 @@ impl SslContext { } pub struct X509StoreContext { - priv ctx: *ffi::X509_STORE_CTX + ctx: *ffi::X509_STORE_CTX } impl X509StoreContext { @@ -218,8 +218,8 @@ impl X509StoreContext { /// A public key certificate pub struct X509<'ctx> { - priv ctx: &'ctx X509StoreContext, - priv x509: *ffi::X509 + ctx: &'ctx X509StoreContext, + x509: *ffi::X509 } impl<'ctx> X509<'ctx> { @@ -230,8 +230,8 @@ impl<'ctx> X509<'ctx> { } pub struct X509Name<'x> { - priv x509: &'x X509<'x>, - priv name: *ffi::X509_NAME + x509: &'x X509<'x>, + name: *ffi::X509_NAME } pub enum X509NameFormat { @@ -459,9 +459,9 @@ impl MemBio { /// A stream wrapper which handles SSL encryption for an underlying stream. pub struct SslStream<S> { - priv stream: S, - priv ssl: Ssl, - priv buf: Vec<u8> + stream: S, + ssl: Ssl, + buf: Vec<u8> } impl<S: Stream> SslStream<S> { |