Hi,
On Sun, Mar 28, 2021 at 02:02:41PM +0200, Arne Schwabe wrote:
[..]
> @@ -2240,7 +2240,8 @@ error:
> * to the TLS control channel (cleartext).
> */
> static bool
> -key_method_2_write(struct buffer *buf, struct tls_session *session)
> +key_method_2_write(struct buffer *buf, struct tls_multi *multi,
> + struct tls_session *session)
> {
For master, this conflicts with commit 8fa8a17528c (compress migrate),
which already introduces the "multi" parameter. Master only needs the
second hunk (documentation plus CAS_SUCCEEDED check).
For release/2.5, this should be fine.
How do we want to proceed? Take this as "for 2.5", and you send a v3
"for master"?
I have tested this patch for master, on top of "1666 with the
ENABLE_ASYNC_PUSH fixed", and it passes the server side test rig...
Test sets succeeded: 1 1a 1b 1c 1d 1e 2 2a 2b 2c 2g 2d 2e 2f 2z1 2z2 3 4 4a 4b
5 5a 5b 5c 5d 5v1 5v2 5v3 5w1 5w2 5w3 5w4 5x1 5x2 5x3 5x4 6 7 7x 7y 8 8a 9 9a.
... and also the "I have a client with --bind and renegotiate and then
reconnect right after ctrl-c" test... so this looks ready to go.
gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany g...@greenie.muc.de
signature.asc
Description: PGP signature
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
