From 7610804c9d861455d118e60f62e4beb96a064598 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Fri, 22 Jan 2016 19:10:22 -0800
Subject: [PATCH] Remove unwraps from rsa accessors

---
 openssl/src/crypto/rsa.rs | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/openssl/src/crypto/rsa.rs b/openssl/src/crypto/rsa.rs
index fca94465..ffc11255 100644
--- a/openssl/src/crypto/rsa.rs
+++ b/openssl/src/crypto/rsa.rs
@@ -1,6 +1,7 @@
 use ffi;
 use bn::BigNum;
 use std::fmt;
+use ssl::error::SslError;
 
 pub struct RSA {
     rsa_obj : ffi::RSA
@@ -8,33 +9,33 @@ pub struct RSA {
 
 impl RSA {
     // The following getters are unsafe, since BigNum::new_from_ffi fails upon null pointers
-    pub fn n(&self) -> BigNum {
+    pub fn n(&self) -> Result<BigNum, SslError> {
         unsafe {
-            BigNum::new_from_ffi(self.rsa_obj.n).unwrap()
+            BigNum::new_from_ffi(self.rsa_obj.n)
         }
     }
 
-    pub fn d(&self) -> BigNum {
+    pub fn d(&self) -> Result<BigNum, SslError> {
         unsafe {
-            BigNum::new_from_ffi(self.rsa_obj.d).unwrap()
+            BigNum::new_from_ffi(self.rsa_obj.d)
         }
     }
 
-    pub fn e(&self) -> BigNum {
+    pub fn e(&self) -> Result<BigNum, SslError> {
         unsafe {
-            BigNum::new_from_ffi(self.rsa_obj.e).unwrap()
+            BigNum::new_from_ffi(self.rsa_obj.e)
         }
     }
 
-    pub fn p(&self) -> BigNum {
+    pub fn p(&self) -> Result<BigNum, SslError> {
         unsafe {
-            BigNum::new_from_ffi(self.rsa_obj.p).unwrap()
+            BigNum::new_from_ffi(self.rsa_obj.p)
         }
     }
 
-    pub fn q(&self) -> BigNum {
+    pub fn q(&self) -> Result<BigNum, SslError> {
         unsafe {
-            BigNum::new_from_ffi(self.rsa_obj.q).unwrap()
+            BigNum::new_from_ffi(self.rsa_obj.q)
         }
     }
 }