min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Chris Cole 2015-01-05 23:53:23 -05:00
parent b2929a662a 3ab2e07618
commit 63fda80bf7
4 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "openssl" name = "openssl"
version = "0.2.11" version = "0.2.12"
authors = ["Steven Fackler <sfackler@gmail.com>"] authors = ["Steven Fackler <sfackler@gmail.com>"]
license = "Apache-2.0" license = "Apache-2.0"
description = "OpenSSL bindings" description = "OpenSSL bindings"
@ -17,4 +17,4 @@ aes_xts = ["openssl-sys/aes_xts"]
[dependencies.openssl-sys] [dependencies.openssl-sys]
path = "openssl-sys" path = "openssl-sys"
version = "0.2.11" version = "0.2.12"

2
openssl-sys/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "openssl-sys" name = "openssl-sys"
version = "0.2.11" version = "0.2.12"
authors = ["Alex Crichton <alex@alexcrichton.com>", authors = ["Alex Crichton <alex@alexcrichton.com>",
"Steven Fackler <sfackler@gmail.com>"] "Steven Fackler <sfackler@gmail.com>"]
license = "MIT" license = "MIT"

32
src/bn/mod.rs
View File

@ -493,43 +493,57 @@ pub mod unchecked {
use ffi; use ffi;
use super::{BigNum}; use super::{BigNum};
impl<'a> Add<&'a BigNum, BigNum> for &'a BigNum { impl<'a> Add<&'a BigNum> for &'a BigNum {
type Output = BigNum;
fn add(self, oth: &'a BigNum) -> BigNum { fn add(self, oth: &'a BigNum) -> BigNum {
self.checked_add(oth).unwrap() self.checked_add(oth).unwrap()
} }
} }
impl<'a> Sub<&'a BigNum, BigNum> for &'a BigNum { impl<'a> Sub<&'a BigNum> for &'a BigNum {
type Output = BigNum;
fn sub(self, oth: &'a BigNum) -> BigNum { fn sub(self, oth: &'a BigNum) -> BigNum {
self.checked_sub(oth).unwrap() self.checked_sub(oth).unwrap()
} }
} }
impl<'a> Mul<&'a BigNum, BigNum> for &'a BigNum { impl<'a> Mul<&'a BigNum> for &'a BigNum {
type Output = BigNum;
fn mul(self, oth: &'a BigNum) -> BigNum { fn mul(self, oth: &'a BigNum) -> BigNum {
self.checked_mul(oth).unwrap() self.checked_mul(oth).unwrap()
} }
} }
impl<'a> Div<&'a BigNum, BigNum> for &'a BigNum { impl<'a> Div<&'a BigNum> for &'a BigNum {
type Output = BigNum;
fn div(self, oth: &'a BigNum) -> BigNum { fn div(self, oth: &'a BigNum) -> BigNum {
self.checked_div(oth).unwrap() self.checked_div(oth).unwrap()
} }
} }
impl<'a> Rem<&'a BigNum, BigNum> for &'a BigNum { impl<'a> Rem<&'a BigNum> for &'a BigNum {
type Output = BigNum;
fn rem(self, oth: &'a BigNum) -> BigNum { fn rem(self, oth: &'a BigNum) -> BigNum {
self.checked_mod(oth).unwrap() self.checked_mod(oth).unwrap()
} }
} }
impl<'a> Shl<i32, BigNum> for &'a BigNum { impl<'a> Shl<i32> for &'a BigNum {
type Output = BigNum;
fn shl(self, n: i32) -> BigNum { fn shl(self, n: i32) -> BigNum {
self.checked_shl(&n).unwrap() self.checked_shl(&n).unwrap()
} }
} }
impl<'a> Shr<i32, BigNum> for &'a BigNum { impl<'a> Shr<i32> for &'a BigNum {
type Output = BigNum;
fn shr(self, n: i32) -> BigNum { fn shr(self, n: i32) -> BigNum {
self.checked_shr(&n).unwrap() self.checked_shr(&n).unwrap()
} }
@ -548,7 +562,9 @@ pub mod unchecked {
} }
} }
impl Neg<BigNum> for BigNum { impl Neg for BigNum {
type Output = BigNum;
fn neg(self) -> BigNum { fn neg(self) -> BigNum {
let mut n = self.clone(); let mut n = self.clone();
n.negate(); n.negate();

2
src/lib.rs
View File

@ -1,4 +1,4 @@
#![feature(macro_rules, unsafe_destructor, globs)] #![feature(macro_rules, unsafe_destructor, globs, associated_types, default_type_params, old_orphan_check)]
#![crate_name="openssl"] #![crate_name="openssl"]
#![crate_type="rlib"] #![crate_type="rlib"]
#![crate_type="dylib"] #![crate_type="dylib"]