From fa622326490e1dd27df4d42b4097ca574deedb3f Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sat, 30 Jan 2016 12:55:22 -0800 Subject: Error reform --- openssl/src/asn1/mod.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'openssl/src/asn1') diff --git a/openssl/src/asn1/mod.rs b/openssl/src/asn1/mod.rs index d5561b62..202909ec 100644 --- a/openssl/src/asn1/mod.rs +++ b/openssl/src/asn1/mod.rs @@ -2,8 +2,7 @@ use libc::c_long; use std::ptr; use ffi; -use ssl::error::SslError; - +use error::ErrorStack; pub struct Asn1Time { handle: *mut ffi::ASN1_TIME, @@ -19,7 +18,7 @@ impl Asn1Time { } } - fn new_with_period(period: u64) -> Result { + fn new_with_period(period: u64) -> Result { ffi::init(); let handle = unsafe { @@ -29,7 +28,7 @@ impl Asn1Time { } /// Creates a new time on specified interval in days from now - pub fn days_from_now(days: u32) -> Result { + pub fn days_from_now(days: u32) -> Result { Asn1Time::new_with_period(days as u64 * 60 * 60 * 24) } -- cgit v1.2.3 From bc97d088b0e71a1bde0a88bc548718c427124d0c Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Fri, 5 Aug 2016 21:07:17 -0700 Subject: get_handle -> handle --- openssl/src/asn1/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'openssl/src/asn1') diff --git a/openssl/src/asn1/mod.rs b/openssl/src/asn1/mod.rs index 202909ec..39273cb8 100644 --- a/openssl/src/asn1/mod.rs +++ b/openssl/src/asn1/mod.rs @@ -33,7 +33,7 @@ impl Asn1Time { } /// Returns raw handle - pub unsafe fn get_handle(&self) -> *mut ffi::ASN1_TIME { + pub unsafe fn handle(&self) -> *mut ffi::ASN1_TIME { return self.handle; } } -- cgit v1.2.3 From 5af01a5dbd42a20cd8114f03168b014ae4d9d023 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sat, 6 Aug 2016 22:23:03 -0700 Subject: Clean up asn1time --- openssl/src/asn1/mod.rs | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) (limited to 'openssl/src/asn1') diff --git a/openssl/src/asn1/mod.rs b/openssl/src/asn1/mod.rs index 39273cb8..e79a0fd2 100644 --- a/openssl/src/asn1/mod.rs +++ b/openssl/src/asn1/mod.rs @@ -4,44 +4,36 @@ use std::ptr; use ffi; use error::ErrorStack; -pub struct Asn1Time { - handle: *mut ffi::ASN1_TIME, - owned: bool, -} +pub struct Asn1Time(*mut ffi::ASN1_TIME); impl Asn1Time { /// Wraps existing ASN1_TIME and takes ownership - pub fn new(handle: *mut ffi::ASN1_TIME) -> Asn1Time { - Asn1Time { - handle: handle, - owned: true, - } + pub unsafe fn from_raw(handle: *mut ffi::ASN1_TIME) -> Asn1Time { + Asn1Time(handle) } - fn new_with_period(period: u64) -> Result { + fn from_period(period: u64) -> Result { ffi::init(); - let handle = unsafe { - try_ssl_null!(ffi::X509_gmtime_adj(ptr::null_mut(), period as c_long)) - }; - Ok(Asn1Time::new(handle)) + unsafe { + let handle = try_ssl_null!(ffi::X509_gmtime_adj(ptr::null_mut(), period as c_long)); + Ok(Asn1Time::from_raw(handle)) + } } /// Creates a new time on specified interval in days from now pub fn days_from_now(days: u32) -> Result { - Asn1Time::new_with_period(days as u64 * 60 * 60 * 24) + Asn1Time::from_period(days as u64 * 60 * 60 * 24) } - /// Returns raw handle - pub unsafe fn handle(&self) -> *mut ffi::ASN1_TIME { - return self.handle; + /// Returns the raw handle + pub fn handle(&self) -> *mut ffi::ASN1_TIME { + self.0 } } impl Drop for Asn1Time { fn drop(&mut self) { - if self.owned { - unsafe { ffi::ASN1_TIME_free(self.handle) }; - } + unsafe { ffi::ASN1_TIME_free(self.0) }; } } -- cgit v1.2.3 From c4e7743c57bde2d25b8a14521c48bba85fe72e68 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Wed, 10 Aug 2016 20:51:06 -0700 Subject: Asn1 and Bignum renames --- openssl/src/asn1/mod.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'openssl/src/asn1') diff --git a/openssl/src/asn1/mod.rs b/openssl/src/asn1/mod.rs index e79a0fd2..7d209775 100644 --- a/openssl/src/asn1/mod.rs +++ b/openssl/src/asn1/mod.rs @@ -8,26 +8,26 @@ pub struct Asn1Time(*mut ffi::ASN1_TIME); impl Asn1Time { /// Wraps existing ASN1_TIME and takes ownership - pub unsafe fn from_raw(handle: *mut ffi::ASN1_TIME) -> Asn1Time { + pub unsafe fn from_ptr(handle: *mut ffi::ASN1_TIME) -> Asn1Time { Asn1Time(handle) } - fn from_period(period: u64) -> Result { + fn from_period(period: c_long) -> Result { ffi::init(); unsafe { - let handle = try_ssl_null!(ffi::X509_gmtime_adj(ptr::null_mut(), period as c_long)); - Ok(Asn1Time::from_raw(handle)) + let handle = try_ssl_null!(ffi::X509_gmtime_adj(ptr::null_mut(), period)); + Ok(Asn1Time::from_ptr(handle)) } } /// Creates a new time on specified interval in days from now pub fn days_from_now(days: u32) -> Result { - Asn1Time::from_period(days as u64 * 60 * 60 * 24) + Asn1Time::from_period(days as c_long * 60 * 60 * 24) } /// Returns the raw handle - pub fn handle(&self) -> *mut ffi::ASN1_TIME { + pub fn as_ptr(&self) -> *mut ffi::ASN1_TIME { self.0 } } -- cgit v1.2.3