diff options
| author | Matt Caswell <matt@openssl.org> | 2016-11-15 16:31:26 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-11-16 10:34:41 +0000 |
| commit | b5c8f42c9b9fce5d1b14866306e7a11e16275942 (patch) | |
| tree | dcad0194233d3eaf8492fad6c3ee41bc29f4f5c4 /include | |
| parent | d18afb5bf29dc3b81b5f7a9eda2abde35041a441 (diff) | |
Remove a hack from ssl_test_old
ssl_test_old was reaching inside the SSL structure and changing the internal
BIO values. This is completely unneccessary, and was causing an abort in the
test when enabling TLSv1.3.
I also removed the need for ssl_test_old to include ssl_locl.h. This
required the addition of some missing accessors for SSL_COMP name and id
fields.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit e304d3e20f45243f9e643607edfe4db49c329596)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/ssl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 86ab9125de..ccb2d35533 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1777,6 +1777,8 @@ void SSL_set_tmp_dh_callback(SSL *ssl, __owur const COMP_METHOD *SSL_get_current_compression(SSL *s); __owur const COMP_METHOD *SSL_get_current_expansion(SSL *s); __owur const char *SSL_COMP_get_name(const COMP_METHOD *comp); +__owur const char *SSL_COMP_get0_name(const SSL_COMP *comp); +__owur int SSL_COMP_get_id(const SSL_COMP *comp); STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void); __owur STACK_OF(SSL_COMP) *SSL_COMP_set0_compression_methods(STACK_OF(SSL_COMP) *meths); |