From 8b60d4a3c2822ab20988439c46f973ae86367d48 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Wed, 16 Nov 2016 15:45:15 -0800 Subject: [PATCH] Return Option from group --- openssl/src/ec.rs | 9 ++++++--- 1 file 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 _)) + } } }