commit bbefab7f662cc568cbd364ed6f9fa4a7964ab461
author Jim Schaad <ietf@augustcellars.com> Mon Feb 01 12:46:56 2016 -0800
committer Jim Schaad <ietf@augustcellars.com> Mon Feb 01 12:46:56 2016 -0800
tree 72db8863a92d30d3a699fef412352373cecf2b75
parent 3683e6aed82d49bda44025ff07ace786c7e0076d

Fix build errors msvc did not find

src/Recipient.c

diff --git a/src/Recipient.c b/src/Recipient.c
index f7ba63e..a09a34a 100644
--- a/src/Recipient.c
+++ b/src/Recipient.c
@@ -187,11 +187,10 @@
 		}
 	}
 	else {
-		if (pKeyPrivate != NULL) {
+		CHECK_CONDITION(pKeyPrivate != NULL, COSE_ERR_INVALID_PARAMETER);
 			cn = cn_cbor_mapget_int(pKeyPrivate, COSE_Key_Type);
 			CHECK_CONDITION((cn != NULL) && (cn->type == CN_CBOR_UINT), COSE_ERR_INVALID_PARAMETER);
 			CHECK_CONDITION(cn->v.uint == COSE_Key_Type_OCTET, COSE_ERR_INVALID_PARAMETER);
-		}
 
 		CHECK_CONDITION(cn->v.sint == 4, COSE_ERR_INVALID_PARAMETER);
 
@@ -793,7 +792,7 @@
 	cn_cbor_errback cbor_err;
 #ifdef USE_CBOR_CONTEXT
 	cn_cbor_context * context;
-#endif;
+#endif
 
 	CHECK_CONDITION(IsValidRecipientHandle(h), COSE_ERR_INVALID_HANDLE);
 	CHECK_CONDITION(pKey != NULL, COSE_ERR_INVALID_PARAMETER);

src/cose.h

diff --git a/src/cose.h b/src/cose.h
index 2df6954..620b39b 100644
--- a/src/cose.h
+++ b/src/cose.h
@@ -204,7 +204,7 @@
 
 bool COSE_Recipient_SetKey_secret(HCOSE_RECIPIENT h, const byte * rgb, int cb, const byte * rgbKid, int cbKid, cose_errback * perr);
 bool COSE_Recipient_SetKey(HCOSE_RECIPIENT h, const cn_cbor * pKey, cose_errback * perror);
-bool COSE_Recipient_SetSenderKey(HCOSE_RECIPIENT h, const cn_cbor * pKey, cose_errback * perror);
+bool COSE_Recipient_SetSenderKey(HCOSE_RECIPIENT h, const cn_cbor * pKey, int destination, cose_errback * perror);
 bool COSE_Recipient_SetExternal(HCOSE_RECIPIENT hcose, const byte * pbExternalData, size_t cbExternalData, cose_errback * perr);
 
 bool COSE_Recipient_map_put(HCOSE_RECIPIENT h, int key, cn_cbor * value, int flags, cose_errback * perror);
@@ -311,4 +311,4 @@
 
 extern cn_cbor * cn_cbor_clone(const cn_cbor * pIn, CBOR_CONTEXT_COMMA cn_cbor_errback * perr);
 extern cn_cbor * cn_cbor_tag_create(int tag, cn_cbor * child, CBOR_CONTEXT_COMMA cn_cbor_errback * perr);
-extern cn_cbor * cn_cbor_bool_create(int boolValue, CBOR_CONTEXT_COMMA cn_cbor_errback * errp);
\ No newline at end of file
+extern cn_cbor * cn_cbor_bool_create(int boolValue, CBOR_CONTEXT_COMMA cn_cbor_errback * errp);