aboutsummaryrefslogtreecommitdiff
path: root/openssl/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-11-16 15:45:15 -0800
committerSteven Fackler <[email protected]>2016-11-16 15:45:15 -0800
commit8b60d4a3c2822ab20988439c46f973ae86367d48 (patch)
tree11051e1bbf7345308dbb9096e149edbddac99a70 /openssl/src
parentRemove EcGroup constructors (diff)
downloadrust-openssl-8b60d4a3c2822ab20988439c46f973ae86367d48.tar.xz
rust-openssl-8b60d4a3c2822ab20988439c46f973ae86367d48.zip
Return Option from group
Diffstat (limited to 'openssl/src')
-rw-r--r--openssl/src/ec.rs9
1 files changed, 6 insertions, 3 deletions
diff --git a/openssl/src/ec.rs b/openssl/src/ec.rs
index fc3240f1..607c30e0 100644
--- a/openssl/src/ec.rs
+++ b/openssl/src/ec.rs
@@ -238,11 +238,14 @@ impl EcKeyRef {
private_key_to_pem!(ffi::PEM_write_bio_ECPrivateKey);
private_key_to_der!(ffi::i2d_ECPrivateKey);
- pub fn group(&self) -> &EcGroupRef {
+ pub fn group(&self) -> Option<&EcGroupRef> {
unsafe {
let ptr = ffi::EC_KEY_get0_group(self.as_ptr());
- assert!(!ptr.is_null());
- EcGroupRef::from_ptr(ptr as *mut _)
+ if ptr.is_null() {
+ None
+ } else {
+ Some(EcGroupRef::from_ptr(ptr as *mut _))
+ }
}
}