Merge branch 'master' of github.com:cyassl/cyassl

This commit is contained in:
John Safranek
2013-02-18 15:20:25 -08:00

View File

@ -7527,6 +7527,7 @@ int SetCipherList(Suites* s, const char* list)
&ssl->buffers.serverDH_Pub.length);
FreeDhKey(&dhKey);
InitRsaKey(&rsaKey, ssl->heap);
if (ret == 0) {
length = LENGTH_SZ * 3; /* p, g, pub */
length += ssl->buffers.serverDH_P.length +
@ -7542,7 +7543,6 @@ int SetCipherList(Suites* s, const char* list)
if (!ssl->buffers.key.buffer)
return NO_PRIVATE_KEY;
InitRsaKey(&rsaKey, ssl->heap);
ret = RsaPrivateKeyDecode(ssl->buffers.key.buffer, &i, &rsaKey,
ssl->buffers.key.length);
if (ret == 0) {