]> git.ipfire.org Git - thirdparty/openssl.git/commit
openssl/ssl.h: restore some renamed public SSL_CTRL defines
authorDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Thu, 19 Apr 2018 16:26:36 +0000 (18:26 +0200)
committerDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Fri, 20 Apr 2018 11:01:21 +0000 (13:01 +0200)
commit9d978ac3f304286be13fde228632c2739e00834c
tree24bd4ac3f742b2ec804930cb1f0d6d61c0e165c0
parent4a432af895f7c0928760e76e05dd269bfbc267e1
openssl/ssl.h: restore some renamed public SSL_CTRL defines

Fixes #6022

In commit de4d764e3271, the following SSL_CTRL #define's where renamed

    SSL_CTRL_GET_CURVES        ->  SSL_CTRL_GET_GROUPS
    SSL_CTRL_SET_CURVES        ->  SSL_CTRL_SET_GROUPS
    SSL_CTRL_SET_CURVES_LIST   ->  SSL_CTRL_SET_GROUPS_LIST
    SSL_CTRL_GET_SHARED_CURVE  ->  SSL_CTRL_GET_SHARED_GROUP

The corresponding function-like macros (e.g, SSL_get1_curves(ctx, s)) were
renamed, too, and compatibility #define's were added. This was overlooked for
the above constants. Since the constants are part of the public interface,
they must not be removed for a minor release.

As a consequence the Qt5 configure check (and the build) fails.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6023)
include/openssl/ssl.h