Hi Willy, Thanks for getting this merged!
Cheers, Dirkjan > On 8 Nov 2016, at 13:12, Willy Tarreau <[email protected]> wrote: > > Hi Dirkjan, > > I finally merged your patch after discussing with Emeric. He's fine with > it as well. Both of us think that the breakage of openssl 0.9.8 is not a > showstopper at the moment and that the best way to know if/how it needs to > be fixed is to let it go in the wild. Given that openssl 1.1.0 was released > 3 months ago and 0.9.8 has been dead for almost a year, I prefer that our > new haproxy version focuses on the future than on the past, especially with > the reduced life of new versions (eg: 1.0.2 only has two more years left). > > I got two annoying warnings affecting either older versions or newer ones, > each time due to a const being put at the right place in a function prototype. > So I added another patch to deal with this, it defines a new macro called > __OPENSSL_110_CONST__ which equals "const" on 1.1.0 and nothing on older > versions. > > I also moved the include file to include/proto/openssl-compat.h since it > only defines prototypes. But the main reason I must confess is that the > previous choice (include/compat/openssl.h) was causing me a lot of pain by > breaking my auto-completion, and after spending a few hours on it, I had > to forfeit on trying to get my fingers to switch "comm<tab>" instead of the > shorter "c<tab>" they've been trained to for a decade :-/ > > I'm appending the 3 patches I added on top of yours and that I merged as > one single patch. As you said, 1.1.0 builds with a few "deprecated" warnings > which are still OK for now as the affected functions are part of the API and > that we can clean later. I tested 1.0.1 and 1.0.2 and they were OK as well. > > Now if anyone is interested in trying to port the code to 0.9.8 (should not be > too hard, just a few more #ifdef to add), proposals are welcome. > > Thanks! > Willy > <0001-WIP-ssl-1.1.0-protect-compat-openssl.h-against-multi.patch><0002-WIP-ssl-1.1.0-add-a-const-type-modifier-only-for-1.1.patch><0003-WIP-ssl-1.1.0-move-include-to-proto-openssl-compat.h.patch>
