]> git.ipfire.org Git - thirdparty/openssl.git/commit
Fix conflicts between DH check flags and FFC check flags
authorRichard Levitte <levitte@openssl.org>
Fri, 20 Oct 2023 07:24:01 +0000 (09:24 +0200)
committerHugo Landau <hlandau@openssl.org>
Mon, 6 Nov 2023 07:54:36 +0000 (07:54 +0000)
commit81a7f2a25d5833cee4130544a9301ffc29f30cbc
tree8a33ffc8043eb5dec9c7eef8ce12841121d69e9d
parentdb925ae2e65d0d925adef429afc37f75bd1c2017
Fix conflicts between DH check flags and FFC check flags

There are comments in include/openssl/dh.h and include/internal/ffc.h
that they must be aligned with each other, and yet, clashes have been
introduced.

The simplest fix is to move the offending FFC flags out of the way, as they
are indeed internal and shouldn't affect any public interface, apart from
those that are aligned with the DH flags, which are public.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22518)

(cherry picked from commit 3629ce9c4cb638d9458d8febd21659920903a749)
include/internal/ffc.h