[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Bug-wget] Use of 'ssl_st'
From: |
Tim Rühsen |
Subject: |
Re: [Bug-wget] Use of 'ssl_st' |
Date: |
Thu, 05 Feb 2015 21:30:59 +0100 |
User-agent: |
KMail/4.14.2 (Linux/3.16.0-4-amd64; KDE/4.14.2; x86_64; ; ) |
Am Donnerstag, 5. Februar 2015, 16:30:00 schrieb Gisle Vanem:
> The recent changes in OpenSSL's API has caused libcurl, Wget
> and probably other packages to break. Here is one example:
>
> openssl.c(548) : error C2037: left of 'state' specifies undefined
> struct/union 'ssl_st'
>
> This structure is now tucked away in ssl_locl.h.
>
> What can be done about this? There is probably a function/macro
> for it now. Here I just did a:
>
> --- a/openssl.c 2015-02-05 15:31:22 +0000
> +++ b/openssl.c 2015-02-05 16:22:54 +0000
> @@ -545,7 +545,11 @@
> DEBUGP (("SSL handshake timed out.\n"));
> goto timeout;
> }
> - if (scwt_ctx.result <= 0 || conn->state != SSL_ST_OK)
> + if (scwt_ctx.result <= 0
> +#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
> + || conn->state != SSL_ST_OK
> +#endif
> + )
> goto error;
>
> ctx = xnew0 (struct openssl_transport_context);
Gisle, after reading the appropriate OpenSSL docs, I guess we could even drop
checking conn->state. There is no comment that explains why the developer did
what he did. But to not introduce a regression, let's keep it for a while.
@Darshit,@Guiseppe If you don't mind, I push this patch (or you if you are
faster).
Thanks, Gisle !
Tim
signature.asc
Description: This is a digitally signed message part.
- Re: [Bug-wget] Use of 'ssl_st', (continued)
- Re: [Bug-wget] Use of 'ssl_st', Daniel Kahn Gillmor, 2015/02/05
- Re: [Bug-wget] Use of 'ssl_st', Darshit Shah, 2015/02/05
- Re: [Bug-wget] Use of 'ssl_st', Daniel Kahn Gillmor, 2015/02/05
- Re: [Bug-wget] Use of 'ssl_st', Daniel Stenberg, 2015/02/05
- Re: [Bug-wget] Use of 'ssl_st', Daniel Kahn Gillmor, 2015/02/05
- Re: [Bug-wget] Use of 'ssl_st', Daniel Stenberg, 2015/02/05
Re: [Bug-wget] Use of 'ssl_st', Daniel Kahn Gillmor, 2015/02/05
Re: [Bug-wget] Use of 'ssl_st',
Tim Rühsen <=
Message not available