commit d55bd797eb2f06c3f89f0df7895ab13f13d6f6c0
author David Benjamin <davidben@google.com> Thu May 18 11:33:08 2017 -0400
committer Adam Langley <agl@google.com> Thu May 18 15:49:31 2017 +0000
tree 2add25443e6b0687d68a2773ff349cb5ff947106
parent 250542312b3e74e068634473a4cd2b63e4ed915d

Fix SSL_COMP_get_compression_methods type signature.

We returned the wrong type, but with a typedef which made it void*. In
C++, void* to T* doesn't implicitly convert, so it doesn't quite work
right. Notably, Node passes it into sk_SSL_COMP_zero. The sk_* macros
only weakly typecheck right now, but a pending CL converts them to
proper functions.

Change-Id: I635d1e39e4f4f11b2b7bf350115a7f1b1be30e4f
Reviewed-on: https://boringssl-review.googlesource.com/16447
Reviewed-by: Adam Langley <agl@google.com>

include/openssl/ssl.h

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 0c2b5c1..93809dd 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -3354,7 +3354,7 @@
 typedef void COMP_METHOD;
 
 /* SSL_COMP_get_compression_methods returns NULL. */
-OPENSSL_EXPORT COMP_METHOD *SSL_COMP_get_compression_methods(void);
+OPENSSL_EXPORT STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void);
 
 /* SSL_COMP_add_compression_method returns one. */
 OPENSSL_EXPORT int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm);

ssl/ssl_cipher.c

diff --git a/ssl/ssl_cipher.c b/ssl/ssl_cipher.c
index da3f382..83dea45 100644
--- a/ssl/ssl_cipher.c
+++ b/ssl/ssl_cipher.c
@@ -1724,7 +1724,7 @@
   return "TLSv1/SSLv3";
 }
 
-COMP_METHOD *SSL_COMP_get_compression_methods(void) { return NULL; }
+STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void) { return NULL; }
 
 int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm) { return 1; }