diff options
| author | Aaron Weiss <[email protected]> | 2014-12-19 10:45:19 -0500 |
|---|---|---|
| committer | Aaron Weiss <[email protected]> | 2014-12-19 10:45:19 -0500 |
| commit | a637f2b0bfaa077e1e56edc83d76677bccff09c6 (patch) | |
| tree | e252abe5b1fcea61cab36f101315189a650d7ad7 /src | |
| parent | Merge pull request #119 from glennw/android-static-linking (diff) | |
| download | rust-openssl-a637f2b0bfaa077e1e56edc83d76677bccff09c6.tar.xz rust-openssl-a637f2b0bfaa077e1e56edc83d76677bccff09c6.zip | |
Updated for language changes to macros.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bn/mod.rs | 6 | ||||
| -rw-r--r-- | src/crypto/hmac.rs | 2 | ||||
| -rw-r--r-- | src/x509/mod.rs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/bn/mod.rs b/src/bn/mod.rs index b409cb73..721fcea5 100644 --- a/src/bn/mod.rs +++ b/src/bn/mod.rs @@ -26,7 +26,7 @@ macro_rules! with_ctx( r } }); -) +); macro_rules! with_bn( ($name:ident, $action:block) => ({ @@ -42,7 +42,7 @@ macro_rules! with_bn( Err(err) => Err(err), } }); -) +); macro_rules! with_bn_in_ctx( ($name:ident, $ctx_name:ident, $action:block) => ({ @@ -66,7 +66,7 @@ macro_rules! with_bn_in_ctx( Err(err) => Err(err), } }); -) +); impl BigNum { pub fn new() -> Result<BigNum, SslError> { diff --git a/src/crypto/hmac.rs b/src/crypto/hmac.rs index 8096a948..aab0c014 100644 --- a/src/crypto/hmac.rs +++ b/src/crypto/hmac.rs @@ -55,7 +55,7 @@ impl HMAC { let mut res = Vec::from_elem(self.len, 0u8); let mut outlen = 0; ffi::HMAC_Final(&mut self.ctx, res.as_mut_ptr(), &mut outlen); - assert!(self.len == outlen as uint) + assert!(self.len == outlen as uint); res } } diff --git a/src/x509/mod.rs b/src/x509/mod.rs index 8baafe41..c82eab11 100644 --- a/src/x509/mod.rs +++ b/src/x509/mod.rs @@ -449,7 +449,7 @@ macro_rules! make_validation_error( } } ) -) +); make_validation_error!(X509_V_OK, X509UnableToGetIssuerCert = X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT, @@ -505,7 +505,7 @@ make_validation_error!(X509_V_OK, X509UnsupportedNameSyntax = X509_V_ERR_UNSUPPORTED_NAME_SYNTAX, X509CrlPathValidationError= X509_V_ERR_CRL_PATH_VALIDATION_ERROR, X509ApplicationVerification = X509_V_ERR_APPLICATION_VERIFICATION, -) +); #[test] |