Skip to content

Update ike.keyfile.cpp to work with OpenSSL 3.0 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
reos-rcrozier wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update ike.keyfile.cpp to work with OpenSSL 3.0 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9494f43
Update ike.keyfile.cpp
reos-rcrozier Oct 5, 2024
ea75b2b
Update CMakeLists.txt
reos-rcrozier Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,11 +326,18 @@ endif( NOT CMAKE_USE_PTHREADS_INIT )

if( NOT APPLE )

check_library_exists(
${CMAKE_THREAD_LIBS_INIT}
"pthread_mutex_timedlock"
""
FUNC_LIB_TIMEDLOCK )
# check_library_exists(
# ${CMAKE_THREAD_LIBS_INIT}
# "pthread_mutex_timedlock"
# ""
# FUNC_LIB_TIMEDLOCK )

check_library_exists(
pthread
pthread_mutex_timedlock
pthread.h
FUNC_LIB_TIMEDLOCK )


endif( NOT APPLE )

Expand Down
10 changes: 5 additions & 5 deletions source/iked/ike.keyfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@ bool prvkey_rsa_load_pem( BDATA & prvkey, FILE * fp, BDATA & pass )
if( evp_pkey == NULL )
return false;

bool converted = prvkey_rsa_2_bdata( prvkey, EVP_PKEY_get0_RSA( evp_pkey ) );
bool converted = prvkey_rsa_2_bdata( prvkey, (rsa_st*)EVP_PKEY_get0_RSA( evp_pkey ) );
EVP_PKEY_free( evp_pkey );

return converted;
Expand All @@ -884,7 +884,7 @@ bool prvkey_rsa_load_p12( BDATA & prvkey, FILE * fp, BDATA & pass )
if( evp_pkey == NULL )
return false;

bool converted = prvkey_rsa_2_bdata( prvkey, EVP_PKEY_get0_RSA( evp_pkey ) );
bool converted = prvkey_rsa_2_bdata( prvkey, (rsa_st*)EVP_PKEY_get0_RSA( evp_pkey ) );
EVP_PKEY_free( evp_pkey );

return converted;
Expand Down Expand Up @@ -940,7 +940,7 @@ bool prvkey_rsa_load_pem( BDATA & prvkey, BDATA & input, BDATA & pass )
if( evp_pkey == NULL )
return false;

bool converted = prvkey_rsa_2_bdata( prvkey, EVP_PKEY_get0_RSA( evp_pkey ) );
bool converted = prvkey_rsa_2_bdata( prvkey, (rsa_st*)EVP_PKEY_get0_RSA( evp_pkey ) );
EVP_PKEY_free( evp_pkey );

return converted;
Expand Down Expand Up @@ -977,7 +977,7 @@ bool prvkey_rsa_load_p12( BDATA & prvkey, BDATA & input, BDATA & pass )
if( evp_pkey == NULL )
return false;

bool converted = prvkey_rsa_2_bdata( prvkey, EVP_PKEY_get0_RSA( evp_pkey ) );
bool converted = prvkey_rsa_2_bdata( prvkey, (rsa_st*)EVP_PKEY_get0_RSA( evp_pkey ) );
EVP_PKEY_free( evp_pkey );

return converted;
Expand Down Expand Up @@ -1011,7 +1011,7 @@ bool _IKED::pubkey_rsa_read( BDATA & cert, BDATA & pubkey )
if( evp_pkey == NULL )
return false;

bool result = pubkey_rsa_2_bdata( pubkey, EVP_PKEY_get0_RSA( evp_pkey ) );
bool result = pubkey_rsa_2_bdata( pubkey, (rsa_st*)EVP_PKEY_get0_RSA( evp_pkey ) );

EVP_PKEY_free( evp_pkey );

Expand Down