summaryrefslogtreecommitdiff
path: root/openssl/src/cms.rs
diff options
context:
space:
mode:
authorSteven Fackler <sfackler@gmail.com>2018-06-01 20:07:13 -0700
committerSteven Fackler <sfackler@gmail.com>2018-06-01 20:07:13 -0700
commitc2145384a956e176612f5088cee53e7afe449f1e (patch)
treed619e255766a6929930396d0b60ab14594c662ac /openssl/src/cms.rs
parent63afe3016c5c3e615dca2fd27a5ed09a4a025359 (diff)
downloadrust-openssl-c2145384a956e176612f5088cee53e7afe449f1e.zip
Fix types
Diffstat (limited to 'openssl/src/cms.rs')
-rw-r--r--openssl/src/cms.rs15
1 files changed, 9 insertions, 6 deletions
diff --git a/openssl/src/cms.rs b/openssl/src/cms.rs
index 5781a01f..d8d64c00 100644
--- a/openssl/src/cms.rs
+++ b/openssl/src/cms.rs
@@ -13,8 +13,8 @@ use bio::{MemBio, MemBioSlice};
use error::ErrorStack;
use libc::c_uint;
use pkey::{HasPrivate, PKeyRef};
-use stack::Stack;
-use x509::X509;
+use stack::StackRef;
+use x509::{X509, X509Ref};
use {cvt, cvt_p};
bitflags! {
@@ -130,13 +130,16 @@ impl CmsContentInfo {
/// OpenSSL documentation at [`CMS_sign`]
///
/// [`CMS_sign`]: https://www.openssl.org/docs/manmaster/man3/CMS_sign.html
- pub fn sign<T: HasPrivate>(
- signcert: Option<&X509>,
+ pub fn sign<T>(
+ signcert: Option<&X509Ref>,
pkey: Option<&PKeyRef<T>>,
- certs: Option<&Stack<X509>>,
+ certs: Option<&StackRef<X509>>,
data: Option<&[u8]>,
flags: CMSOptions,
- ) -> Result<CmsContentInfo, ErrorStack> {
+ ) -> Result<CmsContentInfo, ErrorStack>
+ where
+ T: HasPrivate,
+ {
unsafe {
let signcert = signcert.map_or(ptr::null_mut(), |p| p.as_ptr());
let pkey = pkey.map_or(ptr::null_mut(), |p| p.as_ptr());