aboutsummaryrefslogtreecommitdiff
path: root/src/bn
diff options
context:
space:
mode:
authorValerii Hiora <[email protected]>2015-01-03 16:42:58 +0200
committerValerii Hiora <[email protected]>2015-01-03 16:42:58 +0200
commitcf028e971a11f7ab0a5ab2c01daa03d559db1322 (patch)
tree7d7d52e3e7542c7cea656ea69e7a05d10c4ab7b4 /src/bn
parentMerge pull request #134 from DiamondLovesYou/master (diff)
downloadrust-openssl-cf028e971a11f7ab0a5ab2c01daa03d559db1322.tar.xz
rust-openssl-cf028e971a11f7ab0a5ab2c01daa03d559db1322.zip
Updated to master:
- library stab issues - deriving -> derive - {mod} -> {self}
Diffstat (limited to 'src/bn')
-rw-r--r--src/bn/mod.rs18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/bn/mod.rs b/src/bn/mod.rs
index bcf6c104..0bc79a8f 100644
--- a/src/bn/mod.rs
+++ b/src/bn/mod.rs
@@ -1,13 +1,14 @@
use libc::{c_int, c_ulong, c_void};
-use std::{fmt, ptr};
use std::c_str::CString;
+use std::cmp::Ordering;
+use std::{fmt, ptr};
use ffi;
use ssl::error::SslError;
pub struct BigNum(*mut ffi::BIGNUM);
-#[deriving(Copy)]
+#[derive(Copy)]
#[repr(C)]
pub enum RNGProperty {
MsbMaybeZero = -1,
@@ -303,11 +304,11 @@ impl BigNum {
unsafe {
let res = ffi::BN_ucmp(self.raw(), oth.raw()) as i32;
if res < 0 {
- Less
+ Ordering::Less
} else if res > 0 {
- Greater
+ Ordering::Greater
} else {
- Equal
+ Ordering::Equal
}
}
}
@@ -382,11 +383,11 @@ impl PartialOrd for BigNum {
let v = ffi::BN_cmp(self.raw(), oth.raw());
let ret =
if v == 0 {
- Equal
+ Ordering::Equal
} else if v < 0 {
- Less
+ Ordering::Less
} else {
- Greater
+ Ordering::Greater
};
Some(ret)
}
@@ -404,6 +405,7 @@ impl Drop for BigNum {
}
pub mod unchecked {
+ use std::ops::{Add, Div, Mul, Neg, Rem, Shl, Shr, Sub};
use ffi;
use super::{BigNum};