From c776534ad4c89a23870aafb83709a25bc558fad0 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Tue, 1 Nov 2016 19:25:40 -0700
Subject: [PATCH] Clean up stack

---
 openssl-sys/src/ossl10x.rs |  2 ++
 openssl/src/stack.rs       | 28 ++++++----------------------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/openssl-sys/src/ossl10x.rs b/openssl-sys/src/ossl10x.rs
index 07fa7d468..461ee9b58 100644
--- a/openssl-sys/src/ossl10x.rs
+++ b/openssl-sys/src/ossl10x.rs
@@ -594,6 +594,8 @@ extern {
     pub fn EVP_MD_CTX_create() -> *mut EVP_MD_CTX;
     pub fn EVP_MD_CTX_destroy(ctx: *mut EVP_MD_CTX);
 
+    pub fn sk_num(st: *mut _STACK) -> c_int;
+    pub fn sk_value(st: *mut _STACK, n: c_int) -> *mut c_void;
     pub fn sk_free(st: *mut _STACK);
     pub fn sk_pop_free(st: *mut _STACK, free: Option<unsafe extern "C" fn (*mut c_void)>);
     pub fn sk_pop(st: *mut _STACK) -> *mut c_void;
diff --git a/openssl/src/stack.rs b/openssl/src/stack.rs
index bb1ddfdaa..e48ebe777 100644
--- a/openssl/src/stack.rs
+++ b/openssl/src/stack.rs
@@ -2,17 +2,16 @@ use std::ops::{Deref, DerefMut, Index, IndexMut};
 use std::iter;
 use std::borrow::Borrow;
 use std::convert::AsRef;
-
-#[cfg(ossl110)]
 use libc::c_int;
 
 use ffi;
 use types::{OpenSslType, Ref};
 
 #[cfg(ossl10x)]
-use ffi::{sk_pop as OPENSSL_sk_pop, sk_free as OPENSSL_sk_free};
+use ffi::{sk_pop as OPENSSL_sk_pop,sk_free as OPENSSL_sk_free, sk_num as OPENSSL_sk_num,
+    sk_value as OPENSSL_sk_value};
 #[cfg(ossl110)]
-use ffi::{OPENSSL_sk_pop, OPENSSL_sk_free};
+use ffi::{OPENSSL_sk_pop, OPENSSL_sk_free, OPENSSL_sk_num, OPENSSL_sk_value};
 
 /// Trait implemented by types which can be placed in a stack.
 ///
@@ -117,17 +116,7 @@ impl<T: Stackable> Ref<Stack<T>> {
 
     /// Returns the number of items in the stack
     pub fn len(&self) -> usize {
-        self._len()
-    }
-
-    #[cfg(ossl10x)]
-    fn _len(&self) -> usize {
-        unsafe { (*self.as_stack()).num as usize }
-    }
-
-    #[cfg(ossl110)]
-    fn _len(&self) -> usize {
-        unsafe { ffi::OPENSSL_sk_num(self.as_stack()) as usize }
+        unsafe { OPENSSL_sk_num(self.as_stack()) as usize }
     }
 
     pub fn iter(&self) -> Iter<T> {
@@ -176,14 +165,9 @@ impl<T: Stackable> Ref<Stack<T>> {
         }
     }
 
-    #[cfg(ossl10x)]
-    unsafe fn _get(&self, idx: usize) -> *mut T::CType {
-        *(*self.as_stack()).data.offset(idx as isize) as *mut _
-    }
-
-    #[cfg(ossl110)]
     unsafe fn _get(&self, idx: usize) -> *mut T::CType {
-        ffi::OPENSSL_sk_value(self.as_stack(), idx as c_int) as *mut _
+        assert!(idx <= c_int::max_value() as usize);
+        OPENSSL_sk_value(self.as_stack(), idx as c_int) as *mut _
     }
 }
 
-- 
GitLab