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:55:01 +0000 (07:55 +0000)
commitbc224e7edf87bbb353d51e9cb5c5999af8828856
treee1af335135f3ed21a8bd14cea323d898e9478c2a
parentec061bf8ff2add8050599058557178c03295bcc0
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/22453)
include/internal/ffc.h