diff options
| author | Alan Antonuk <alan.antonuk@gmail.com> | 2023-02-02 08:28:05 +0000 |
|---|---|---|
| committer | Alan Antonuk <alan.antonuk@gmail.com> | 2023-02-02 03:54:23 -0500 |
| commit | 40c629a5c2c57cb0c80137f35cf817bb61ae203c (patch) | |
| tree | 6b05fa64dc0751dd148b1f3766412a7ea004feb4 | |
| parent | baced83d2ccb3aef1233d1d9be1139b36913a8bd (diff) | |
| download | rabbitmq-c-40c629a5c2c57cb0c80137f35cf817bb61ae203c.tar.gz | |
remove obsolete const workaround in ssl bio
This workaround was needed for OpenSSL v1.1.0 and older. rabbitmq-c
requires v1.1.1 or newer, so this workaround can be removed.
Signed-off-by: GitHub <noreply@github.com>
| -rw-r--r-- | librabbitmq/amqp_openssl_bio.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/librabbitmq/amqp_openssl_bio.c b/librabbitmq/amqp_openssl_bio.c index a1f02df..5955c75 100644 --- a/librabbitmq/amqp_openssl_bio.c +++ b/librabbitmq/amqp_openssl_bio.c @@ -109,18 +109,15 @@ int amqp_openssl_bio_init(void) { return AMQP_STATUS_NO_MEMORY; } - // casting away const is necessary until - // https://github.com/openssl/openssl/pull/2181/, which is targeted for - // openssl 1.1.1 - BIO_METHOD *meth = (BIO_METHOD *)BIO_s_socket(); - BIO_meth_set_create(amqp_bio_method, BIO_meth_get_create(meth)); - BIO_meth_set_destroy(amqp_bio_method, BIO_meth_get_destroy(meth)); - BIO_meth_set_ctrl(amqp_bio_method, BIO_meth_get_ctrl(meth)); - BIO_meth_set_callback_ctrl(amqp_bio_method, BIO_meth_get_callback_ctrl(meth)); - BIO_meth_set_read(amqp_bio_method, BIO_meth_get_read(meth)); - BIO_meth_set_write(amqp_bio_method, BIO_meth_get_write(meth)); - BIO_meth_set_gets(amqp_bio_method, BIO_meth_get_gets(meth)); - BIO_meth_set_puts(amqp_bio_method, BIO_meth_get_puts(meth)); + BIO_meth_set_create(amqp_bio_method, BIO_meth_get_create(BIO_s_socket())); + BIO_meth_set_destroy(amqp_bio_method, BIO_meth_get_destroy(BIO_s_socket())); + BIO_meth_set_ctrl(amqp_bio_method, BIO_meth_get_ctrl(BIO_s_socket())); + BIO_meth_set_callback_ctrl(amqp_bio_method, + BIO_meth_get_callback_ctrl(BIO_s_socket())); + BIO_meth_set_read(amqp_bio_method, BIO_meth_get_read(BIO_s_socket())); + BIO_meth_set_write(amqp_bio_method, BIO_meth_get_write(BIO_s_socket())); + BIO_meth_set_gets(amqp_bio_method, BIO_meth_get_gets(BIO_s_socket())); + BIO_meth_set_puts(amqp_bio_method, BIO_meth_get_puts(BIO_s_socket())); BIO_meth_set_write(amqp_bio_method, amqp_openssl_bio_write); BIO_meth_set_read(amqp_bio_method, amqp_openssl_bio_read); |