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:27:40 +0000 |
| commit | e304d3e20f45243f9e643607edfe4db49c329596 (patch) | |
| tree | 1e176628375cc56adb05623203ac42b6f8265546 /ssl/ssl_ciph.c | |
| parent | 5a2443aee4c1bf583d19a2c5f68b87b52dcece7f (diff) | |
| download | openssl-e304d3e20f45243f9e643607edfe4db49c329596.zip openssl-e304d3e20f45243f9e643607edfe4db49c329596.tar.gz openssl-e304d3e20f45243f9e643607edfe4db49c329596.tar.bz2 | |
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>
Diffstat (limited to 'ssl/ssl_ciph.c')
| -rw-r--r-- | ssl/ssl_ciph.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 9d259c1..feef184 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -1871,6 +1871,24 @@ const char *SSL_COMP_get_name(const COMP_METHOD *comp) #endif } +const char *SSL_COMP_get0_name(const SSL_COMP *comp) +{ +#ifndef OPENSSL_NO_COMP + return comp->name; +#else + return NULL; +#endif +} + +int SSL_COMP_get_id(const SSL_COMP *comp) +{ +#ifndef OPENSSL_NO_COMP + return comp->id; +#else + return -1; +#endif +} + /* For a cipher return the index corresponding to the certificate type */ int ssl_cipher_get_cert_index(const SSL_CIPHER *c) { |