commit 7fd2cdc4a7786a6a1aef8e4dce1c18b217f02d08
author Jim Schaad <ietf@augustcellars.com> Wed Jan 06 21:06:29 2016 -0800
committer Jim Schaad <ietf@augustcellars.com> Wed Jan 06 21:06:29 2016 -0800
tree c1faa70450d4c292bda8be7514f293a2e750fbf9
parent 509589fddc8d9c6d1d2bba184c9e6e8cee4a5fc6

Fix allocation error for KeyWrap

src/openssl.c

diff --git a/src/openssl.c b/src/openssl.c
index 645c7f6..7916cef 100644
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -756,19 +756,22 @@
 
 bool AES_KW_Encrypt(COSE_RecipientInfo * pcose, const byte * pbKeyIn, int cbitKey, const byte *  pbContent, int  cbContent, cose_errback * perr)
 {
-	byte rgbOut[256 / 8];
+	byte  *pbOut = NULL;
 	AES_KEY key;
 #ifdef USE_CBOR_CONTEXT
 	cn_cbor_context * context = &pcose->m_encrypt.m_message.m_allocContext;
 #endif
 	cn_cbor * cnTmp = NULL;
 
+	pbOut = COSE_CALLOC(cbContent + 8, 1, context);
+
 	CHECK_CONDITION(AES_set_encrypt_key(pbKeyIn, cbitKey, &key) == 0, COSE_ERR_CRYPTO_FAIL);
 
-	CHECK_CONDITION(AES_wrap_key(&key, NULL, rgbOut, pbContent, cbContent), COSE_ERR_CRYPTO_FAIL);
+	CHECK_CONDITION(AES_wrap_key(&key, NULL, pbOut, pbContent, cbContent), COSE_ERR_CRYPTO_FAIL);
 
-	cnTmp = cn_cbor_data_create(rgbOut, (int)cbContent + 8, CBOR_CONTEXT_PARAM_COMMA NULL);
+	cnTmp = cn_cbor_data_create(pbOut, (int)cbContent + 8, CBOR_CONTEXT_PARAM_COMMA NULL);
 	CHECK_CONDITION(cnTmp != NULL, COSE_ERR_CBOR);
+	pbOut = NULL;
 	CHECK_CONDITION(_COSE_array_replace(&pcose->m_encrypt.m_message, cnTmp, INDEX_BODY, CBOR_CONTEXT_PARAM_COMMA NULL), COSE_ERR_CBOR);
 	cnTmp = NULL;
 
@@ -776,6 +779,7 @@
 
 errorReturn:
 	COSE_FREE(cnTmp, context);
+	if (pbOut != NULL) COSE_FREE(pbOut, context);
 	return false;
 }