Commit 33297934 authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge pull request #126 from aatxe/master 

Updated for language changes to macros.
parents 88b753d3 a637f2b0

src/bn/mod.rs

+3 −3
Original line number Diff line number Diff line
@@ -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> {

src/crypto/hmac.rs

+1 −1
Original line number Diff line number Diff line
@@ -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

        }

    }

src/x509/mod.rs

+2 −2
Original line number Diff line number Diff line
@@ -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]