Disabled by default
Fixes #8360
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8370)
(cherry picked from commit
ac4033d658e4dc210ed4552b88069b57532ba3d7)
Changes between 1.1.1b and 1.1.1c [xx XXX xxxx]
Changes between 1.1.1b and 1.1.1c [xx XXX xxxx]
+ *) Added build tests for C++. These are generated files that only do one
+ thing, to include one public OpenSSL head file each. This tests that
+ the public header files can be usefully included in a C++ application.
+
+ This test isn't enabled by default. It can be enabled with the option
+ 'enable-buildtest-c++'.
+ [Richard Levitte]
+
*) Change the default RSA, DSA and DH size to 2048 bit instead of 1024.
This changes the size when using the genpkey app when no size is given. It
fixes an omission in earlier changes that changed all RSA, DSA and DH
*) Change the default RSA, DSA and DH size to 2048 bit instead of 1024.
This changes the size when using the genpkey app when no size is given. It
fixes an omission in earlier changes that changed all RSA, DSA and DH
"autoload-config",
"bf",
"blake2",
"autoload-config",
"bf",
"blake2",
"camellia",
"capieng",
"cast",
"camellia",
"capieng",
"cast",
our %disabled = ( # "what" => "comment"
"asan" => "default",
our %disabled = ( # "what" => "comment"
"asan" => "default",
+ "buildtest-c++" => "default",
"crypto-mdebug" => "default",
"crypto-mdebug-backtrace" => "default",
"devcryptoeng" => "default",
"crypto-mdebug" => "default",
"crypto-mdebug-backtrace" => "default",
"devcryptoeng" => "default",
foreach my $what (sort keys %disabled) {
$config{options} .= " no-$what";
foreach my $what (sort keys %disabled) {
$config{options} .= " no-$what";
- if (!grep { $what eq $_ } ( 'threads', 'shared', 'pic',
+ if (!grep { $what eq $_ } ( 'buildtest-c++', 'threads', 'shared', 'pic',
'dynamic-engine', 'makedepend',
'zlib-dynamic', 'zlib', 'sse2' )) {
(my $WHAT = uc $what) =~ s|-|_|g;
'dynamic-engine', 'makedepend',
'zlib-dynamic', 'zlib', 'sse2' )) {
(my $WHAT = uc $what) =~ s|-|_|g;
INCLUDE[buildtest_c_$name]=../include
DEPEND[buildtest_c_$name]=../libssl ../libcrypto
_____
INCLUDE[buildtest_c_$name]=../include
DEPEND[buildtest_c_$name]=../libssl ../libcrypto
_____
- $OUT .= <<"_____" if $config{CXX};
+ $OUT .= <<"_____" if $config{CXX} && !$disabled{"buildtest-c++"};
PROGRAMS_NO_INST=buildtest_cc_$name
SOURCE[buildtest_cc_$name]=buildtest_$name.cc
PROGRAMS_NO_INST=buildtest_cc_$name
SOURCE[buildtest_cc_$name]=buildtest_$name.cc