iked wont crash no more

nbdy · Oct 15, 2020 · e3df127 · e3df127
1 parent 869ad15
commit e3df127
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,7 +29,7 @@ include(CheckLibraryExists)
 
 include_directories(source/)
 
-set(RELVER "4.2.0")
+set(RELVER "2.2.1")
 
 subdirs(
 	source/iked
@@ -315,7 +315,7 @@ endif( NOT PATH_INC_PFKEYV2 )
 #
 
 OPTION( DEBUG   "include Debug Symbol support" )
-OPTION( NATT    "include NAT Traversal support" )
+OPTION( NATT    "include NAT Traversal support" ON)
 OPTION( LDAP    "include LDAP Authentication support" )
 OPTION( QTGUI   "include Client QT GUI support" )
 OPTION( TESTS   "include library test programs" )
@@ -325,6 +325,8 @@ OPTION( SBINDIR "custom sbin install path" )
 OPTION( LIBDIR  "custom library install path" )
 OPTION( MANDIR  "custom man page install path" )
 
+
+
 # Debug Symbols Option
 
 if( DEBUG )

diff --git a/source/iked/crypto.cpp b/source/iked/crypto.cpp
@@ -381,7 +381,7 @@ bool dh_init( long group, DH ** dh_data, long * dh_size )
 	auto *p = BN_new();
 	auto *g = BN_new();
 
-	DH_set0_pqg(dh, p, nullptr, nullptr);
+	DH_set0_pqg(dh, p, nullptr, g);
 	DH_set_length(dh, 0);
 
 	//

diff --git a/source/iked/ike.cpp b/source/iked/ike.cpp
@@ -391,8 +391,7 @@ long _IKED::packet_ike_decrypt( IDB_PH1 * sa, PACKET_IKE & packet, BDATA * iv )
 	// init cipher key and iv
 	//
 
-	EVP_CIPHER_CTX *ctx_cipher;
-	EVP_CIPHER_CTX_init( ctx_cipher );
+	EVP_CIPHER_CTX *ctx_cipher = EVP_CIPHER_CTX_new();
 
 	EVP_CipherInit_ex(
 		ctx_cipher,
@@ -595,8 +594,7 @@ long _IKED::packet_ike_encrypt( IDB_PH1 * sa, PACKET_IKE & packet, BDATA * iv )
 	// encrypt all but header
 	//
 
-	EVP_CIPHER_CTX *ctx_cipher;
-	EVP_CIPHER_CTX_init( ctx_cipher );
+	EVP_CIPHER_CTX *ctx_cipher = EVP_CIPHER_CTX_new();
 
 	EVP_CipherInit_ex(
 		ctx_cipher,

diff --git a/source/iked/ike.exch.phase1.cpp b/source/iked/ike.exch.phase1.cpp
@@ -2579,7 +2579,7 @@ long _IKED::phase1_gen_natd( IDB_PH1 * ph1 )
 	// compute the nat discovery
 	// hash for local address
 	//
-
+    ctx_hash = EVP_MD_CTX_new();
 	EVP_DigestInit( ctx_hash, ph1->evp_hash );
 	EVP_DigestUpdate( ctx_hash, ph1->cookies.i, ISAKMP_COOKIE_SIZE );
 	EVP_DigestUpdate( ctx_hash, ph1->cookies.r, ISAKMP_COOKIE_SIZE );