denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkcs12: Treat empty string and no password differently

Browse Source 
When deriving the PKCS#12 key, the empty string should result in a
non-zero length Unicode string (two bytes for the 0 terminator).
This commit is contained in:
Tobias Brunner
2023-11-13 12:26:07 +01:00
parent 7bb6aed5ab
commit ad804fa036
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/credentials/containers/pkcs12.c
+1 -1
View File
@@ -157,7 +157,7 @@ bool pkcs12_derive_key(hash_algorithm_t hash, chunk_t password, chunk_t salt,
bool success; bool success;
int i; int i;
if (password.len) if (password.ptr)
{ /* convert the password to UTF-16BE (without BOM) with 0 terminator */ { /* convert the password to UTF-16BE (without BOM) with 0 terminator */
unicode = chunk_alloca(password.len * 2 + 2); unicode = chunk_alloca(password.len * 2 + 2);
for (i = 0; i < password.len; i++) for (i = 0; i < password.len; i++)