[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  77f31b3a8a7a2c3ee5a3a4da9843b4b224b32300 (commit)
       via  3e45d39347dc901fa2f8c9bded8d2b3940c103f0 (commit)
      from  85d7bdf03614334a52984df889146286f6e5720d (commit)


- Log -----------------------------------------------------------------
commit 77f31b3a8a7a2c3ee5a3a4da9843b4b224b32300
Author: Mat <mberchtold at gmail.com>
Date:   Sat Jan 9 20:22:17 2016 +0100

    Adds missing type casts
    
    This fixes https://github.com/openssl/openssl/issues/534
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

commit 3e45d39347dc901fa2f8c9bded8d2b3940c103f0
Author: Mat <mberchtold at gmail.com>
Date:   Sat Jan 9 23:55:57 2016 +0100

    Adds crypto-mdebug as a valid option
    
    Adds crypto-mdebug as a valid option. Fixes https://github.com/openssl/openssl/issues/537
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure                   | 1 +
 include/openssl/safestack.h | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Configure b/Configure
index c6c68bf..3a5bd8e 100755
--- a/Configure
+++ b/Configure
@@ -834,6 +834,7 @@ my @disablables = (
     "cmac",
     "cms",
     "comp",
+    "crypto-mdebug",
     "ct",
     "deprecated",
     "des",
diff --git a/include/openssl/safestack.h b/include/openssl/safestack.h
index 9eb4477..71d639f 100644
--- a/include/openssl/safestack.h
+++ b/include/openssl/safestack.h
@@ -96,7 +96,7 @@ extern "C" {
     } \
     static ossl_inline t2 *sk_##t1##_value(const STACK_OF(t1) *sk, int idx) \
     { \
-        return sk_value((_STACK *)sk, idx); \
+        return (t2 *)sk_value((_STACK *)sk, idx); \
     } \
     static ossl_inline STACK_OF(t1) *sk_##t1##_new(int (*cmpf)(const t3 * const *a, const t3 * const *b)) \
     { \
@@ -116,11 +116,11 @@ extern "C" {
     } \
     static ossl_inline t2 *sk_##t1##_delete(STACK_OF(t1) *sk, int i) \
     { \
-        return sk_delete((_STACK *)sk, i); \
+        return (t2 *)sk_delete((_STACK *)sk, i); \
     } \
     static ossl_inline t2 *sk_##t1##_delete_ptr(STACK_OF(t1) *sk, t2 *ptr) \
     { \
-        return sk_delete_ptr((_STACK *)sk, (void *)ptr); \
+        return (t2 *)sk_delete_ptr((_STACK *)sk, (void *)ptr); \
     } \
     static ossl_inline int sk_##t1##_push(STACK_OF(t1) *sk, t2 *ptr) \
     { \
@@ -148,7 +148,7 @@ extern "C" {
     } \
     static ossl_inline t2 *sk_##t1##_set(STACK_OF(t1) *sk, int idx, t2 *ptr) \
     { \
-        return sk_set((_STACK *)sk, idx, (void *)ptr); \
+        return (t2 *)sk_set((_STACK *)sk, idx, (void *)ptr); \
     } \
     static ossl_inline int sk_##t1##_find(STACK_OF(t1) *sk, t2 *ptr) \
     { \