Hi, On Fri, Nov 03, 2017 at 07:24:33PM +0100, Gert Doering wrote: > On Mon, Oct 23, 2017 at 11:40:13AM +0200, Steffan Karger wrote: > > This can be const, and should thus be const. (Also, resolves a compiler > > warning.) [..] > I think the patch is good, but it *so* does not apply for me... > > Applying: make struct key * argument of init_key_ctx const > error: patch failed: src/openvpn/crypto.c:826 > error: src/openvpn/crypto.c: patch does not apply > error: patch failed: src/openvpn/crypto.h:321 > error: src/openvpn/crypto.h: patch does not apply
Looked at the first two occurences, and the confusion is explained - this
change is already in "master" but not in 2.4
master/crypto.h
void init_key_ctx(struct key_ctx *ctx, const struct key *key,
const struct key_type *kt, int enc,
const char *prefix);
2.4/crypto.h
void init_key_ctx(struct key_ctx *ctx, struct key *key,
const struct key_type *kt, int enc,
const char *prefix);
I'm too lazy to trace which patch changed master, and did not get
cherrypicked to 2.4 - but this is reasonable to apply to 2.4 (-only),
so I will :-) - ACK.
gert
--
USENET is *not* the non-clickable part of WWW!
//www.muc.de/~gert/
Gert Doering - Munich, Germany g...@greenie.muc.de
fax: +49-89-35655025 g...@net.informatik.tu-muenchen.de
signature.asc
Description: PGP signature
------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
