Skip to content

merge changes in openssl API #3

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
ljmanso wants to merge 1 commit into
base: master
Choose a base branch
from
Open

merge changes in openssl API #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 0 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,16 +324,6 @@ if( NOT CMAKE_USE_PTHREADS_INIT )

endif( NOT CMAKE_USE_PTHREADS_INIT )

if( NOT APPLE )

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

endif( NOT APPLE )

if( FUNC_LIB_TIMEDLOCK )

add_definitions( -DOPT_TIMEDLOCK )
Expand Down
4 changes: 2 additions & 2 deletions source/iked/ike.keyfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ bool bdata_2_cert( X509 ** x509, BDATA & cert )
return true;
}

bool prvkey_rsa_2_bdata( BDATA & prvkey, RSA * rsa )
bool prvkey_rsa_2_bdata( BDATA & prvkey, const RSA * rsa )
{
int size = i2d_RSAPrivateKey( rsa, NULL );
prvkey.size( size );
Expand All @@ -123,7 +123,7 @@ bool bdata_2_prvkey_rsa( RSA ** rsa, BDATA & prvkey )
return true;
}

bool pubkey_rsa_2_bdata( BDATA & pubkey, RSA * rsa )
bool pubkey_rsa_2_bdata( BDATA & pubkey, const RSA * rsa )
{
int size = i2d_RSAPublicKey( rsa, NULL );
pubkey.size( size );
Expand Down