[
https://issues.apache.org/jira/browse/TS-5059?focusedWorklogId=34823&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-34823
]
ASF GitHub Bot logged work on TS-5059:
--------------------------------------
Author: ASF GitHub Bot
Created on: 05/Jan/17 19:53
Start Date: 05/Jan/17 19:53
Worklog Time Spent: 10m
Work Description: Github user jablko commented on a diff in the pull
request:
https://github.com/apache/trafficserver/pull/1294#discussion_r94839085
--- Diff: iocore/net/BIO_fastopen.cc ---
@@ -116,39 +115,21 @@ static long
fastopen_ctrl(BIO *bio, int cmd, long larg, void *ptr)
{
switch (cmd) {
- case BIO_C_SET_FD:
- ink_assert(larg == BIO_CLOSE || larg == BIO_NOCLOSE);
- ink_assert(bio->num == NO_FD);
-
- bio->init = 1;
- bio->shutdown = larg;
- bio->num = *reinterpret_cast<int *>(ptr);
- return 0;
-
case BIO_C_SET_CONNECT:
// We only support BIO_set_conn_address(), which sets a sockaddr.
ink_assert(larg == 2);
- bio->ptr = ptr;
+ BIO_set_data(bio, ptr);
return 0;
- // We are unbuffered so unconditionally succeed on BIO_flush().
- case BIO_CTRL_FLUSH:
- return 1;
-
- case BIO_CTRL_PUSH:
- case BIO_CTRL_POP:
- return 0;
-
- default:
-#if DEBUG
- ink_abort("unsupported BIO control cmd=%d larg=%ld ptr=%p", cmd, larg,
ptr);
-#endif
-
- return 0;
+ case BIO_C_SET_FD:
+ ink_assert(larg == BIO_CLOSE || larg == BIO_NOCLOSE);
+ ink_assert(BIO_get_fd(bio, nullptr) == NO_FD);
--- End diff --
Done.
Issue Time Tracking
-------------------
Worklog Id: (was: 34823)
Time Spent: 8h 20m (was: 8h 10m)
> ATS 7.0.0 build fails with OpenSSL 1.1.0c
> -----------------------------------------
>
> Key: TS-5059
> URL: https://issues.apache.org/jira/browse/TS-5059
> Project: Traffic Server
> Issue Type: Bug
> Components: SSL, TLS
> Reporter: Jean Baptiste Favre
> Fix For: 7.1.0
>
> Time Spent: 8h 20m
> Remaining Estimate: 0h
>
> ATS 7.0.0 build currently fails with following error:
> {code}SSLInternal.cc: In function ‘void SSL_set_rbio(SSL*, BIO*)’:
> SSLInternal.cc:40:10: error: invalid use of incomplete type ‘SSL {aka
> struct ssl_st}’
> if (ssl->rbio != NULL) {
> ^~
> In file included from /usr/include/openssl/crypto.h:31:0,
> from /usr/include/openssl/comp.h:16,
> from /usr/include/openssl/ssl.h:47,
> from SSLInternal.cc:33:
> /usr/include/openssl/ossl_typ.h:144:16: note: forward declaration of
> ‘SSL {aka struct ssl_st}’
> typedef struct ssl_st SSL;
> ^~~~~~
> SSLInternal.cc:41:17: error: invalid use of incomplete type ‘SSL {aka
> struct ssl_st}’
> BIO_free(ssl->rbio);
> ^~
> In file included from /usr/include/openssl/crypto.h:31:0,
> from /usr/include/openssl/comp.h:16,
> from /usr/include/openssl/ssl.h:47,
> from SSLInternal.cc:33:
> /usr/include/openssl/ossl_typ.h:144:16: note: forward declaration of
> ‘SSL {aka struct ssl_st}’
> typedef struct ssl_st SSL;
> ^~~~~~
> SSLInternal.cc:43:6: error: invalid use of incomplete type ‘SSL {aka
> struct ssl_st}’
> ssl->rbio = rbio;
> ^~
> In file included from /usr/include/openssl/crypto.h:31:0,
> from /usr/include/openssl/comp.h:16,
> from /usr/include/openssl/ssl.h:47,
> from SSLInternal.cc:33:
> /usr/include/openssl/ossl_typ.h:144:16: note: forward declaration of
> ‘SSL {aka struct ssl_st}’
> typedef struct ssl_st SSL;
> ^~~~~~
> {code}
> The full configure log can be found here:
> https://gist.github.com/jbfavre/00f63362b435d8ffc682d42d29b671f2
> According to https://wiki.openssl.org/index.php/1.1_API_Changes :
> > setting SSL->rbio without setting SSL->wbio. New function introduction
> in 1.1.0 to handle this: SSL_set_rbio()".
> Problem is, rbio doesn't seems to be nicely detected at configure stage:
> {code}checking for SSL_set_rbio... no
> checking whether to enable set rbio... no{code}
> Binding ATS to OpenSSL 1.0 still works.
> Regards,
> Jean Baptiste Favre
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
