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

Allow crypto IVs with leading zero. Close #2928, fix #2640

Browse Source
This commit is contained in:
nnposter
2024-09-13 21:36:46 +00:00
parent 51b5a50004
commit 3d99250c83
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@@ -22,6 +22,10 @@ o [NSE][GH#2925][GH#2917][GH#2924] Testing for acceptance of SSH keys for
o [NSE][GH#2919][GH#2917] Scripts were not able to load SSH public keys. o [NSE][GH#2919][GH#2917] Scripts were not able to load SSH public keys.
from a file. [nnposter] from a file. [nnposter]
o [NSE][GH#2928][GH#2640] Encryption/decryption performed by the OpenSSL NSE
module did not work correctly when the IV started with a null byte.
[nnposter]
o [NSE][GH#2901][GH#2744][GH#2745] Arbitrary separator in stdnse.tohex() is now o [NSE][GH#2901][GH#2744][GH#2745] Arbitrary separator in stdnse.tohex() is now
supported. Script smb-protocols now reports SMB dialects correctly. supported. Script smb-protocols now reports SMB dialects correctly.
[nnposter] [nnposter]

8
nse_openssl.cc
View File

@@ -387,10 +387,10 @@ static int l_encrypt(lua_State *L) /** encrypt( string algorithm, string key, st
size_t key_len, iv_len, data_len; size_t key_len, iv_len, data_len;
const unsigned char *key = (unsigned char *) luaL_checklstring( L, 2, &key_len ); const unsigned char *key = (unsigned char *) luaL_checklstring( L, 2, &key_len );
const unsigned char *iv = (unsigned char *) luaL_optlstring( L, 3, "", &iv_len ); const unsigned char *iv = (unsigned char *) luaL_optlstring( L, 3, NULL, &iv_len );
const unsigned char *data = (unsigned char *) luaL_checklstring( L, 4, &data_len ); const unsigned char *data = (unsigned char *) luaL_checklstring( L, 4, &data_len );
int padding = lua_toboolean( L, 5 ); int padding = lua_toboolean( L, 5 );
if (iv[0] == '\0') if (!iv_len)
iv = NULL; iv = NULL;
#if HAVE_OPAQUE_STRUCTS #if HAVE_OPAQUE_STRUCTS
@@ -449,10 +449,10 @@ static int l_decrypt(lua_State *L) /** decrypt( string algorithm, string key, st
size_t key_len, iv_len, data_len; size_t key_len, iv_len, data_len;
const unsigned char *key = (unsigned char *) luaL_checklstring( L, 2, &key_len ); const unsigned char *key = (unsigned char *) luaL_checklstring( L, 2, &key_len );
const unsigned char *iv = (unsigned char *) luaL_optlstring( L, 3, "", &iv_len ); const unsigned char *iv = (unsigned char *) luaL_optlstring( L, 3, NULL, &iv_len );
const unsigned char *data = (unsigned char *) luaL_checklstring( L, 4, &data_len ); const unsigned char *data = (unsigned char *) luaL_checklstring( L, 4, &data_len );
int padding = lua_toboolean( L, 5 ); int padding = lua_toboolean( L, 5 );
if (iv[0] == '\0') if (!iv_len)
iv = NULL; iv = NULL;
#if HAVE_OPAQUE_STRUCTS #if HAVE_OPAQUE_STRUCTS