From 3e9e043229c529f09590b7074ba062e0094e9821 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Mon, 3 Oct 2016 15:58:07 -0700 Subject: [PATCH] Add dummy |SSL_COMP_free_compression_methods|. cURL calls this function if |OPENSSL_VERSION_NUMBER| is in [0x10002003, 0x10002fff], which it now is for BoringSSL after 0aecbcf6. Change-Id: I3f224f73f46791bd2232a1a96ed926c32740a6f6 Reviewed-on: https://boringssl-review.googlesource.com/11461 Reviewed-by: David Benjamin Commit-Queue: David Benjamin --- include/openssl/ssl.h | 3 +++ ssl/ssl_cipher.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 806b9372..175160a3 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -3153,6 +3153,9 @@ OPENSSL_EXPORT int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm); /* SSL_COMP_get_name returns NULL. */ OPENSSL_EXPORT const char *SSL_COMP_get_name(const COMP_METHOD *comp); +/* SSL_COMP_free_compression_methods does nothing. */ +OPENSSL_EXPORT void SSL_COMP_free_compression_methods(void); + /* SSLv23_method calls |TLS_method|. */ OPENSSL_EXPORT const SSL_METHOD *SSLv23_method(void); diff --git a/ssl/ssl_cipher.c b/ssl/ssl_cipher.c index 946336f3..4831e9be 100644 --- a/ssl/ssl_cipher.c +++ b/ssl/ssl_cipher.c @@ -1996,6 +1996,8 @@ int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm) { return 1; } const char *SSL_COMP_get_name(const COMP_METHOD *comp) { return NULL; } +void SSL_COMP_free_compression_methods(void) {} + int ssl_cipher_get_key_type(const SSL_CIPHER *cipher) { uint32_t alg_a = cipher->algorithm_auth;