From: Pauli <paul.dale@oracle.com>
Date: Mon, 18 Sep 2017 02:17:18 +0000 (+1000)
Subject: Stack sorting safety
X-Git-Tag: OpenSSL_1_1_1-pre1~649
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d2ef6e4ecc517de9d3d7f71180a6855f1f4d3243;p=oweals%2Fopenssl.git

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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4382)
---

diff --git a/fuzz/client.c b/fuzz/client.c
index 1f4a41123b..ce6d8cc85e 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 e51ce10969..c31cf7ff2f 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;