oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

There is a diffrence between the no password string and the empty

Browse Source 
string, in the empty string the UTF16 NUL terminator is included into
the string.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20661 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-05-10 21:57:58 +00:00
parent 3279ff8331
commit 4d04026180
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/hcrypto/pkcs12.c
View File

@@ -77,7 +77,12 @@ PKCS12_key_gen(const void *key, size_t keylen,
I[i] = ((unsigned char*)salt)[i % saltlen]; I[i] = ((unsigned char*)salt)[i % saltlen];
size_I += vlen; size_I += vlen;
} }
if (key && keylen > 0) { /*
* There is a diffrence between the no password string and the
* empty string, in the empty string the UTF16 NUL terminator is
* included into the string.
*/
if (key && keylen >= 0) {
for (i = 0; i < vlen / 2; i++) { for (i = 0; i < vlen / 2; i++) {
I[(i * 2) + size_I] = 0; I[(i * 2) + size_I] = 0;
I[(i * 2) + size_I + 1] = ((unsigned char*)key)[i % (keylen + 1)]; I[(i * 2) + size_I + 1] = ((unsigned char*)key)[i % (keylen + 1)];