aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/macros.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-11-13 16:18:52 +0000
committerSteven Fackler <[email protected]>2016-11-13 16:18:52 +0000
commited9f600e2889906bb928150d7e892370062f6ca1 (patch)
tree4fc24159db5184d1cfd36dc6c36a65c90479c324 /openssl/src/macros.rs
parentSupport serialization of encrypted private keys (diff)
downloadrust-openssl-ed9f600e2889906bb928150d7e892370062f6ca1.tar.xz
rust-openssl-ed9f600e2889906bb928150d7e892370062f6ca1.zip
Make password callback return a Result
Diffstat (limited to 'openssl/src/macros.rs')
-rw-r--r--openssl/src/macros.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/src/macros.rs b/openssl/src/macros.rs
index 6c37f7b0..0be5ff17 100644
--- a/openssl/src/macros.rs
+++ b/openssl/src/macros.rs
@@ -81,7 +81,7 @@ macro_rules! private_key_from_pem {
pub fn private_key_from_pem_callback<F>(pem: &[u8],
callback: F)
-> Result<$t, ::error::ErrorStack>
- where F: FnOnce(&mut [u8]) -> usize
+ where F: FnOnce(&mut [u8]) -> Result<usize, ::error::ErrorStack>
{
unsafe {
ffi::init();