From 01ae978db0dc8620b2cc754c0d5cf94a68c1f549 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Fri, 4 Nov 2016 16:32:20 -0700 Subject: Get rid of Ref There's unfortunately a rustdoc bug that causes all methods implemented for any Ref to be inlined in the deref methods section :( --- openssl/src/dsa.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'openssl/src/dsa.rs') diff --git a/openssl/src/dsa.rs b/openssl/src/dsa.rs index 6efa7050..9dd5669c 100644 --- a/openssl/src/dsa.rs +++ b/openssl/src/dsa.rs @@ -5,14 +5,14 @@ use std::fmt; use std::ptr; use bio::{MemBio, MemBioSlice}; -use bn::BigNum; +use bn::BigNumRef; use {cvt, cvt_p}; -use types::Ref; +use types::OpenSslTypeRef; use util::{CallbackState, invoke_passwd_cb}; -type_!(Dsa, ffi::DSA, ffi::DSA_free); +type_!(Dsa, DsaRef, ffi::DSA, ffi::DSA_free); -impl Ref { +impl DsaRef { /// Writes an DSA private key as unencrypted PEM formatted data pub fn private_key_to_pem(&self) -> Result, ErrorStack> { assert!(self.has_private_key()); @@ -44,35 +44,35 @@ impl Ref { } } - pub fn p(&self) -> Option<&Ref> { + pub fn p(&self) -> Option<&BigNumRef> { unsafe { let p = compat::pqg(self.as_ptr())[0]; if p.is_null() { None } else { - Some(Ref::::from_ptr(p as *mut _)) + Some(BigNumRef::from_ptr(p as *mut _)) } } } - pub fn q(&self) -> Option<&Ref> { + pub fn q(&self) -> Option<&BigNumRef> { unsafe { let q = compat::pqg(self.as_ptr())[1]; if q.is_null() { None } else { - Some(Ref::::from_ptr(q as *mut _)) + Some(BigNumRef::from_ptr(q as *mut _)) } } } - pub fn g(&self) -> Option<&Ref> { + pub fn g(&self) -> Option<&BigNumRef> { unsafe { let g = compat::pqg(self.as_ptr())[2]; if g.is_null() { None } else { - Some(Ref::::from_ptr(g as *mut _)) + Some(BigNumRef::from_ptr(g as *mut _)) } } } -- cgit v1.2.3