ACK. We made it :-) I've made three changes (as discussed on IRC) to avoid another round for "minor nuisances"
- moved prototype in options.h outside #ifdef ENABLE_OCC (warning if --disable-small) - undo the moving of #if P2MP_SERVER in key_method_2_read() (would break --disable-server) - add an extra "if (multi->remote_ciphername == NULL || ...) clause to the reasons for setting opt->ncp_enabled = false (remote_ciphername will be NULL if talking to a peer that has been built without ENABLE_OCC aka --enable-small) I've tested this on the "t_server" testbed (2.2, 2.3, master clients, plus one extra with --enable-small), client-with-patch against an older server (falling back to BF-CBC, complaining :-) ) and of course full t_client tests (though nothing in the change suspects a possible client failure in that test set). Your patch has been applied to the master branch. Thanks! commit 6e5ad2fa0b1e7ca2e05e0a38f47ed5561cda63b0 Author: Steffan Karger Date: Wed Nov 23 22:21:44 2016 +0100 Poor man's NCP for non-NCP peers Signed-off-by: Steffan Karger <stef...@karger.me> Acked-by: Gert Doering <g...@greenie.muc.de> Message-Id: <1479936104-4045-1-git-send-email-stef...@karger.me> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg13218.html Signed-off-by: Gert Doering <g...@greenie.muc.de> -- kind regards, Gert Doering ------------------------------------------------------------------------------ _______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel