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/mod.rs') 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