[openssl-commits] [openssl] master update

[paul.dale at oracle.com]

The branch master has been updated
       via  d2ef6e4ecc517de9d3d7f71180a6855f1f4d3243 (commit)
      from  9be34ee5c8576539a929d5b396ad071aed525f43 (commit)


- Log -----------------------------------------------------------------
commit d2ef6e4ecc517de9d3d7f71180a6855f1f4d3243
Author: Pauli <paul.dale at oracle.com>
Date:   Mon Sep 18 12:17:18 2017 +1000

    Stack sorting safety
    
    Use the defined typechecking stack method to sort the compression methods stack
    rather than using the generic function and apply type casts.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4382)

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

Summary of changes:
 fuzz/client.c | 2 +-
 fuzz/server.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fuzz/client.c b/fuzz/client.c
index 1f4a411..ce6d8cc 100644
--- a/fuzz/client.c
+++ b/fuzz/client.c
@@ -49,7 +49,7 @@ int FuzzerInitialize(int *argc, char ***argv)
     idx = SSL_get_ex_data_X509_STORE_CTX_idx();
     FuzzerSetRand();
     comp_methods = SSL_COMP_get_compression_methods();
-    OPENSSL_sk_sort((OPENSSL_STACK *)comp_methods);
+    sk_SSL_COMP_sort(comp_methods);
 
 
     return 1;
diff --git a/fuzz/server.c b/fuzz/server.c
index e51ce10..c31cf7f 100644
--- a/fuzz/server.c
+++ b/fuzz/server.c
@@ -496,7 +496,7 @@ int FuzzerInitialize(int *argc, char ***argv)
     idx = SSL_get_ex_data_X509_STORE_CTX_idx();
     FuzzerSetRand();
     comp_methods = SSL_COMP_get_compression_methods();
-    OPENSSL_sk_sort((OPENSSL_STACK *)comp_methods);
+    sk_SSL_COMP_sort(comp_methods);
 
 
     return 1;