Skip to content

Commit cd49b8d

Browse files
madfmadf
committed
Check for GF2m curves, fix some signatures for OpenSSL-3
1 parent 1f27425 commit cd49b8d

9 files changed

Lines changed: 120 additions & 42 deletions

‎CMakeLists.txt‎

Lines changed: 41 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ option(ENABLE_CODECOV "Enable code coverage analysis." OFF)
88
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -W -Wall -Wextra -pedantic")
99
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -W -Wall -Wextra -pedantic")
1010

11-
if ( TIDY )
12-
find_program( CLANG_TIDY_EXE NAMES "clang-tidy" DOC "Path to clang-tidy executable" )
13-
if ( NOT CLANG_TIDY_EXE )
14-
message( STATUS "clang-tidy not found." )
15-
else ()
16-
message( STATUS "clang-tidy found: ${CLANG_TIDY_EXE}" )
17-
set( DO_CLANG_TIDY "${CLANG_TIDY_EXE}"
11+
if(TIDY)
12+
find_program(CLANG_TIDY_EXE NAMES "clang-tidy" DOC "Path to clang-tidy executable")
13+
if(NOT CLANG_TIDY_EXE)
14+
message(STATUS "clang-tidy not found.")
15+
else(NOT CLANG_TIDY_EXE)
16+
message(STATUS "clang-tidy found: ${CLANG_TIDY_EXE}")
17+
set(DO_CLANG_TIDY "${CLANG_TIDY_EXE}"
1818
"-checks=-*,\
1919
clang-analyzer-*,\
2020
misc-*,\
@@ -30,19 +30,40 @@ bugprone-*,\
3030
-modernize-use-trailing-return-type,\
3131
-readability-braces-around-statements, \
3232
-readability-function-cognitive-complexity,\
33-
-readability-magic-numbers" )
34-
endif ()
35-
endif ()
33+
-readability-magic-numbers")
34+
endif(NOT CLANG_TIDY_EXE)
35+
endif(TIDY)
3636

37-
if ( IWYU )
38-
find_program( INCLUDE_WHAT_YOU_USE_EXE NAMES "include-what-you-use" DOC "Path to include-what-you-use executable" )
39-
if ( NOT INCLUDE_WHAT_YOU_USE_EXE )
40-
message( STATUS "include-what-you-use not found." )
41-
else ()
42-
message( STATUS "include-what-you-use found: ${INCLUDE_WHAT_YOU_USE_EXE}" )
37+
if(IWYU)
38+
find_program(INCLUDE_WHAT_YOU_USE_EXE NAMES "include-what-you-use" DOC "Path to include-what-you-use executable")
39+
if(NOT INCLUDE_WHAT_YOU_USE_EXE)
40+
message(STATUS "include-what-you-use not found.")
41+
else(NOT INCLUDE_WHAT_YOU_USE_EXE)
42+
message(STATUS "include-what-you-use found: ${INCLUDE_WHAT_YOU_USE_EXE}")
4343
set( DO_INCLUDE_WHAT_YOU_USE "${INCLUDE_WHAT_YOU_USE_EXE}" )
44-
endif ()
45-
endif ()
44+
endif(NOT INCLUDE_WHAT_YOU_USE_EXE)
45+
endif(IWYU)
46+
47+
find_package(OpenSSL 1.1.0 REQUIRED)
48+
49+
try_compile(HAVE_GF2M_CURVES ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_SOURCE_DIR}/checks/openssl_supports_ec_curve_gf2m.c" LINK_LIBRARIES OpenSSL::Crypto)
50+
if(NOT HAVE_GF2M_CURVES)
51+
message(FATAL_ERROR "OpenSSL is built without support of elliptic curves over GF2m")
52+
endif(NOT HAVE_GF2M_CURVES)
53+
54+
try_compile(COPY_2ND_ARG_IS_CONST ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_SOURCE_DIR}/checks/openssl_pkey_meth_copy_signature.c" COMPILE_DEFINITIONS -Werror=incompatible-pointer-types LINK_LIBRARIES OpenSSL::Crypto)
55+
if(COPY_2ND_ARG_IS_CONST)
56+
message(STATUS "Second argument of PKEY copy method is constant.")
57+
else(COPY_2ND_ARG_IS_CONST)
58+
message(STATUS "Second argument of PKEY copy method is NOT constant.")
59+
endif(COPY_2ND_ARG_IS_CONST)
60+
61+
try_compile(DECODE_2ND_ARG_IS_CONST ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_SOURCE_DIR}/checks/openssl_pkey_asn_decode_signature.c" COMPILE_DEFINITIONS -Werror=incompatible-pointer-types LINK_LIBRARIES OpenSSL::Crypto)
62+
if(DECODE_2ND_ARG_IS_CONST)
63+
message(STATUS "Second argument of PKEY ASN.1 decode method is constant.")
64+
else(DECODE_2ND_ARG_IS_CONST)
65+
message(STATUS "Second argument of PKEY ASN.1 decode method is NOT constant.")
66+
endif(DECODE_2ND_ARG_IS_CONST)
4667

4768
add_subdirectory(dstulib)
4869
add_subdirectory(engine)
@@ -63,9 +84,9 @@ if(ENABLE_CODECOV AND CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
6384
)
6485
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13)
6586
target_link_options(coverage_config INTERFACE --coverage)
66-
else()
87+
else(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13)
6788
target_link_libraries(coverage_config INTERFACE --coverage)
68-
endif()
89+
endif(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13)
6990
else(ENABLE_CODECOV AND CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
7091
if(ENABLE_CODECOV)
7192
message(FATAL_ERROR "Unknown compiler id: ${CMAKE_C_COMPILER_ID}")

‎checks/openssl_pkey_asn_decode_signature.c‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#include <openssl/evp.h>
2+
3+
int decodeMethod(EVP_PKEY* pk, const X509_PUBKEY* pubk)
4+
{
5+
(void)pk;
6+
(void)pubk;
7+
return 0;
8+
}
9+
10+
int main()
11+
{
12+
EVP_PKEY_asn1_set_public(NULL, decodeMethod, NULL, NULL, NULL, NULL, NULL);
13+
return 0;
14+
}

‎checks/openssl_pkey_meth_copy_signature.c‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#include <openssl/evp.h>
2+
3+
int copyMethod(EVP_PKEY_CTX *dst, const EVP_PKEY_CTX *src)
4+
{
5+
(void)dst;
6+
(void)src;
7+
return 0;
8+
}
9+
10+
int main()
11+
{
12+
EVP_PKEY_meth_set_copy(NULL, copyMethod);
13+
return 0;
14+
}

‎checks/openssl_supports_ec_curve_gf2m.c‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#include <openssl/bn.h>
2+
#include <openssl/ec.h>
3+
4+
int main()
5+
{
6+
BN_CTX* ctx = BN_CTX_new();
7+
BIGNUM* p = BN_new();
8+
BIGNUM* a = BN_new();
9+
BIGNUM* b = BN_new();
10+
11+
EC_GROUP* curve = EC_GROUP_new_curve_GF2m(p, a, b, ctx);
12+
return 0;
13+
}

‎dstulib/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ add_library(dstulib OBJECT key.c asn1.c compress.c params.c)
22
target_include_directories(dstulib INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
33
set_target_properties(dstulib PROPERTIES POSITION_INDEPENDENT_CODE ON)
44

5-
if ( CLANG_TIDY_EXE )
6-
set_target_properties ( dstulib PROPERTIES C_CLANG_TIDY "${DO_CLANG_TIDY}" )
7-
endif ()
8-
if ( INCLUDE_WHAT_YOU_USE_EXE )
9-
set_target_properties ( dstulib PROPERTIES C_INCLUDE_WHAT_YOU_USE "${DO_INCLUDE_WHAT_YOU_USE}" )
10-
endif ()
5+
if(CLANG_TIDY_EXE)
6+
set_target_properties(dstulib PROPERTIES C_CLANG_TIDY "${DO_CLANG_TIDY}")
7+
endif(CLANG_TIDY_EXE)
8+
if(INCLUDE_WHAT_YOU_USE_EXE)
9+
set_target_properties(dstulib PROPERTIES C_INCLUDE_WHAT_YOU_USE "${DO_INCLUDE_WHAT_YOU_USE}")
10+
endif(INCLUDE_WHAT_YOU_USE_EXE)
1111

1212
if(ENABLE_CODECOV AND CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
1313
# Add required flags (GCC & LLVM/Clang)

‎engine/CMakeLists.txt‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,32 @@ find_package(OpenSSL 1.1.0 REQUIRED)
22

33
# Remove when https://gitlab.kitware.com/cmake/cmake/issues/18525 is addressed
44
set(OPENSSL_ENGINES_DIR "" CACHE PATH "OpenSSL Engines Directory")
5-
if ("${OPENSSL_ENGINES_DIR}" STREQUAL "")
5+
if("${OPENSSL_ENGINES_DIR}" STREQUAL "")
66
include(FindPkgConfig)
77
pkg_get_variable(OPENSSL_ENGINES_DIR libcrypto enginesdir)
8-
if ("${OPENSSL_ENGINES_DIR}" STREQUAL "")
8+
if("${OPENSSL_ENGINES_DIR}" STREQUAL "")
99
message(FATAL_ERROR "Unable to discover the OpenSSL engines directory. Provide the path using -DOPENSSL_ENGINES_DIR")
10-
endif()
11-
endif()
10+
endif("${OPENSSL_ENGINES_DIR}" STREQUAL "")
11+
endif("${OPENSSL_ENGINES_DIR}" STREQUAL "")
1212

1313
add_library(dstu MODULE dstu.c md.c cipher.c rbg.c pmeth.c ameth.c sign.c err.c)
1414
set_target_properties(dstu PROPERTIES PREFIX "")
1515
target_link_libraries(dstu PUBLIC dstulib coverage_config OpenSSL::Crypto)
1616

17-
if ( CLANG_TIDY_EXE )
18-
set_target_properties ( dstu PROPERTIES C_CLANG_TIDY "${DO_CLANG_TIDY}" )
19-
endif ()
20-
if ( INCLUDE_WHAT_YOU_USE_EXE )
21-
set_target_properties ( dstu PROPERTIES C_INCLUDE_WHAT_YOU_USE "${DO_INCLUDE_WHAT_YOU_USE}" )
22-
endif ()
17+
if(COPY_2ND_ARG_IS_CONST)
18+
target_compile_definitions(dstu PRIVATE COPY_2ND_ARG_IS_CONST)
19+
endif(COPY_2ND_ARG_IS_CONST)
20+
21+
if(DECODE_2ND_ARG_IS_CONST)
22+
target_compile_definitions(dstu PRIVATE DECODE_2ND_ARG_IS_CONST)
23+
endif(DECODE_2ND_ARG_IS_CONST)
24+
25+
if(CLANG_TIDY_EXE)
26+
set_target_properties(dstu PROPERTIES C_CLANG_TIDY "${DO_CLANG_TIDY}")
27+
endif(CLANG_TIDY_EXE)
28+
if(INCLUDE_WHAT_YOU_USE_EXE)
29+
set_target_properties(dstu PROPERTIES C_INCLUDE_WHAT_YOU_USE "${DO_INCLUDE_WHAT_YOU_USE}")
30+
endif(INCLUDE_WHAT_YOU_USE_EXE)
2331

2432
install(TARGETS dstu
2533
LIBRARY DESTINATION ${OPENSSL_ENGINES_DIR})

‎engine/ameth.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,11 @@ void dstu_asn1_pkey_free(EVP_PKEY *pkey)
391391
DSTU_KEY_free(key);
392392
}
393393

394+
#ifdef DECODE_2ND_ARG_IS_CONST
395+
static int dstu_asn1_pub_decode(EVP_PKEY *pk, const X509_PUBKEY *pub)
396+
#else
394397
static int dstu_asn1_pub_decode(EVP_PKEY *pk, X509_PUBKEY *pub)
398+
#endif
395399
{
396400
const ASN1_OBJECT *algoid = NULL;
397401
const unsigned char *pbk_buf = NULL;

‎engine/pmeth.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,11 @@ static int dstu_pkey_verify(EVP_PKEY_CTX *ctx, const unsigned char *sig,
394394
return ret;
395395
}
396396

397+
#ifdef COPY_2ND_ARG_IS_CONST
398+
static int dstu_pkey_copy(EVP_PKEY_CTX *dst, const EVP_PKEY_CTX *src)
399+
#else
397400
static int dstu_pkey_copy(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)
401+
#endif
398402
{
399403
DSTU_KEY_CTX *dstu_src_ctx = EVP_PKEY_CTX_get_data(src), *dstu_dst_ctx;
400404

‎keylib/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ find_package(OpenSSL 1.1.0 REQUIRED)
33
add_library(keylib SHARED key6.c iit_asn1.c jks.c pkcs12.c keystore.c utils.c attrcurvespec_asn1.c)
44
target_link_libraries(keylib PUBLIC dstulib coverage_config OpenSSL::Crypto)
55

6-
if ( CLANG_TIDY_EXE )
7-
set_target_properties ( keylib PROPERTIES C_CLANG_TIDY "${DO_CLANG_TIDY}" )
8-
endif ()
9-
if ( INCLUDE_WHAT_YOU_USE_EXE )
10-
set_target_properties ( keylib PROPERTIES C_INCLUDE_WHAT_YOU_USE "${DO_INCLUDE_WHAT_YOU_USE}" )
11-
endif ()
6+
if(CLANG_TIDY_EXE)
7+
set_target_properties(keylib PROPERTIES C_CLANG_TIDY "${DO_CLANG_TIDY}")
8+
endif(CLANG_TIDY_EXE)
9+
if(INCLUDE_WHAT_YOU_USE_EXE)
10+
set_target_properties(keylib PROPERTIES C_INCLUDE_WHAT_YOU_USE "${DO_INCLUDE_WHAT_YOU_USE}")
11+
endif(INCLUDE_WHAT_YOU_USE_EXE)
1212

1313
install(TARGETS keylib
1414
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

0 commit comments

Comments
 (0)