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

make sure keylen is a multiple of 2

Browse Source
This commit is contained in:
Love Hörnquist Åstrand
2011-07-24 12:34:51 -07:00
parent 84bc108d8f
commit d434bda588
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/hcrypto/pkcs12.c
View File

@@ -55,6 +55,13 @@ PKCS12_key_gen(const void *key, size_t keylen,
unsigned char *outp = out; unsigned char *outp = out;
int i, vlen; int i, vlen;
/**
* The argument key is pointing to an utf16 string, and thus
* keylen that is no a multiple of 2 is invalid.
*/
if (keylen & 1)
return 0;
ctx = EVP_MD_CTX_create(); ctx = EVP_MD_CTX_create();
if (ctx == NULL) if (ctx == NULL)
return 0; return 0;
@@ -83,7 +90,7 @@ PKCS12_key_gen(const void *key, size_t keylen,
* empty string, in the empty string the UTF16 NUL terminator is * empty string, in the empty string the UTF16 NUL terminator is
* included into the string. * included into the string.
*/ */
if (key && keylen >= 0) { if (key) {
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)];