diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdb425e..ad1cdaf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 )
diff --git a/source/iked/ike.keyfile.cpp b/source/iked/ike.keyfile.cpp
index 0ae0ed7..52974b1 100644
--- a/source/iked/ike.keyfile.cpp
+++ b/source/iked/ike.keyfile.cpp
@@ -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 );
@@ -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 );