Am 18.04.2021 um 12:11 schrieb Gert Doering:
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).
I can resend it if you want but this should be a trivial conflict. Maybe even 3way merge might fix it. If you don't count this as trivial conflict (i.e. does the same as the other patch) then I can also resend it.
Arne _______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
