PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00
Code Issues Projects Releases Wiki Activity

Fix a problem in the changes to the openssl NSE library made in r17002

Browse Source 
found by Patrik Karlsson. The second and subsequent times we call
EVP{Encrypt,Decrypt}Init_ex, we have to pass NULL for the type argument.
This allows setting to accumulate from previous calls.
This commit is contained in:
david
2010-03-28 21:18:02 +00:00
parent a646a2ec60
commit 36927f0810
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nse_openssl.cc
View File

@@ -393,7 +393,7 @@ static int l_encrypt(lua_State *L) /** encrypt( string algorithm, string key, st
if (!out) return luaL_error( L, "Couldn't allocate memory."); if (!out) return luaL_error( L, "Couldn't allocate memory.");
if (!( if (!(
EVP_EncryptInit_ex( &cipher_ctx, evp_cipher, NULL, key, iv ) && EVP_EncryptInit_ex( &cipher_ctx, NULL, NULL, key, iv ) &&
EVP_EncryptUpdate( &cipher_ctx, out, &out_len, data, data_len ) && EVP_EncryptUpdate( &cipher_ctx, out, &out_len, data, data_len ) &&
EVP_EncryptFinal_ex( &cipher_ctx, out + out_len, &final_len ) )) { EVP_EncryptFinal_ex( &cipher_ctx, out + out_len, &final_len ) )) {
EVP_CIPHER_CTX_cleanup( &cipher_ctx ); EVP_CIPHER_CTX_cleanup( &cipher_ctx );
@@ -447,7 +447,7 @@ static int l_decrypt(lua_State *L) /** decrypt( string algorithm, string key, st
if (!out) return luaL_error( L, "Couldn't allocate memory."); if (!out) return luaL_error( L, "Couldn't allocate memory.");
if (!( if (!(
EVP_DecryptInit_ex( &cipher_ctx, evp_cipher, NULL, key, iv ) && EVP_DecryptInit_ex( &cipher_ctx, NULL, NULL, key, iv ) &&
EVP_DecryptUpdate( &cipher_ctx, out, &out_len, data, data_len ) && EVP_DecryptUpdate( &cipher_ctx, out, &out_len, data, data_len ) &&
EVP_DecryptFinal_ex( &cipher_ctx, out + out_len, &final_len ) )) { EVP_DecryptFinal_ex( &cipher_ctx, out + out_len, &final_len ) )) {
EVP_CIPHER_CTX_cleanup( &cipher_ctx ); EVP_CIPHER_CTX_cleanup( &cipher_ctx );