aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-07-08 11:23:10 -0700
committerSteven Fackler <[email protected]>2015-07-08 11:23:10 -0700
commit2e0ae7a8ca49fbfd0a99bbdd58fc673328abdc39 (patch)
treecf6a96978a59f2ad1df4b393789750ccd5ad121a
parentMerge pull request #227 from jethrogb/topic/x509_name (diff)
parentAdd missing C-string conversion, fixing recent build errors (diff)
downloadrust-openssl-2e0ae7a8ca49fbfd0a99bbdd58fc673328abdc39.tar.xz
rust-openssl-2e0ae7a8ca49fbfd0a99bbdd58fc673328abdc39.zip
Merge pull request #239 from jethrogb/topic/x509_extension_fix
Add missing C-string conversion, fixing recent build errors
-rw-r--r--openssl/src/x509/mod.rs9
1 files changed, 6 insertions, 3 deletions
diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs
index 67258da5..a5df80f5 100644
--- a/openssl/src/x509/mod.rs
+++ b/openssl/src/x509/mod.rs
@@ -285,10 +285,13 @@ impl X509Generator {
mem::transmute(&ctx),
nid as c_int,
value.as_ptr() as *mut c_char),
- None => ffi::X509V3_EXT_conf(ptr::null_mut(),
+ None => {
+ let name=CString::new(exttype.get_name().unwrap().as_bytes()).unwrap();
+ ffi::X509V3_EXT_conf(ptr::null_mut(),
mem::transmute(&ctx),
- exttype.get_name().unwrap().as_ptr() as *mut c_char,
- value.as_ptr() as *mut c_char),
+ name.as_ptr() as *mut c_char,
+ value.as_ptr() as *mut c_char)
+ }
};
let mut success = false;
if ext != ptr::null_mut() {