feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

adjust key buffer length when using ToTraditional() or ToTraditionalEnc()

Browse Source
This commit is contained in:
Chris Conlon
2013-12-23 14:07:58 -07:00
parent 29c41da818
commit 64912b37f6
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ctaocrypt/src/asn.c
View File

@ -764,7 +764,7 @@ int ToTraditional(byte* input, word32 sz)
XMEMMOVE(input, input + inOutIdx, length); XMEMMOVE(input, input + inOutIdx, length);
return 0; return length;
} }

22
src/ssl.c
View File

@ -1563,6 +1563,7 @@ int CyaSSL_Init(void)
char* consumedEnd; char* consumedEnd;
char* bufferEnd = (char*)(buff + longSz); char* bufferEnd = (char*)(buff + longSz);
long neededSz; long neededSz;
int ret = 0;
int pkcs8 = 0; int pkcs8 = 0;
int pkcs8Enc = 0; int pkcs8Enc = 0;
int dynamicType = 0; int dynamicType = 0;
@ -1714,8 +1715,15 @@ int CyaSSL_Init(void)
&der->length) < 0) &der->length) < 0)
return SSL_BAD_FILE; return SSL_BAD_FILE;
if (pkcs8) if (pkcs8) {
return ToTraditional(der->buffer, der->length); /* convert and adjust length */
if ( (ret = ToTraditional(der->buffer, der->length)) < 0 ) {
return ret;
} else {
der->length = ret;
return 0;
}
}
#if defined(OPENSSL_EXTRA) && !defined(NO_PWDBASED) #if defined(OPENSSL_EXTRA) && !defined(NO_PWDBASED)
if (pkcs8Enc) { if (pkcs8Enc) {
@ -1726,8 +1734,14 @@ int CyaSSL_Init(void)
return SSL_BAD_FILE; /* no callback error */ return SSL_BAD_FILE; /* no callback error */
passwordSz = info->ctx->passwd_cb(password, sizeof(password), 0, passwordSz = info->ctx->passwd_cb(password, sizeof(password), 0,
info->ctx->userdata); info->ctx->userdata);
return ToTraditionalEnc(der->buffer, der->length, password, /* convert and adjust length */
passwordSz); if ( (ret = ToTraditionalEnc(der->buffer, der->length, password,
passwordSz)) < 0 ) {
return ret;
} else {
der->length = ret;
return 0;
}
} }
#endif #endif