Push up code review changes

cose-wg · Apr 28, 2020 · 97748d0 · 97748d0
1 parent 6d4f5ae
commit 97748d0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 28 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -26,6 +26,7 @@ jobs:
             "-DCOSE_C_INCLUDE_ENCRYPT=OFF -DCOSE_C_INCLUDE_ENCRYPT0=OFF -DCOSE_C_INCLUDE_MAC0=OFF -DCOSE_C_INCLUDE_MAC=ON -DCOSE_C_INCLUDE_SIGN=OFF -DCOSE_C_INCLUDE_SIGN1=OFF -DCOSE_C_INCLUDE_COUNTERSIGN=ON",
             "-DCOSE_C_INCLUDE_ENCRYPT=OFF -DCOSE_C_INCLUDE_ENCRYPT0=OFF -DCOSE_C_INCLUDE_MAC0=OFF -DCOSE_C_INCLUDE_MAC=OFF -DCOSE_C_INCLUDE_SIGN=ON -DCOSE_C_INCLUDE_SIGN1=OFF -DCOSE_C_INCLUDE_COUNTERSIGN=ON",
             "-DCOSE_C_INCLUDE_ENCRYPT=OFF -DCOSE_C_INCLUDE_ENCRYPT0=OFF -DCOSE_C_INCLUDE_MAC0=OFF -DCOSE_C_INCLUDE_MAC=OFF -DCOSE_C_INCLUDE_SIGN=OFF -DCOSE_C_INCLUDE_SIGN1=ON -DCOSE_C_INCLUDE_COUNTERSIGN=ON",
+            "-DCOSE_C_OPTIMIZE -DCOSE_C_INCLUDE_COUNTERSIGN=ON"
           ]
 
     steps:

diff --git a/src/CounterSign.c b/src/CounterSign.c
@@ -139,16 +139,16 @@ bool _COSE_CounterSign_add(COSE* pMessage,
 	return false;
 }
 
+#if 0
 /// Get the n-th counter signature from the attribute.
 ///
 HCOSE_COUNTERSIGN _COSE_CounterSign_get(COSE* pMessage,
 	int iSigner,
 	cose_errback* perr)
 {
 	COSE_CounterSign* pSigner = pMessage->m_counterSigners;
-	int i;
 
-	for (i = 0; i < iSigner; i++, pSigner = pSigner->m_next) {
+	for (int i = 0; i < iSigner && pSigner != NULL; i++, pSigner = pSigner->m_next) {
 		CHECK_CONDITION(pSigner != NULL, COSE_ERR_INVALID_PARAMETER);
 	}
 
@@ -157,6 +157,7 @@ HCOSE_COUNTERSIGN _COSE_CounterSign_get(COSE* pMessage,
 errorReturn:
 	return false;
 }
+#endif
 
 /// _COSE_CounterSign_create
 ///

diff --git a/src/Encrypt.c b/src/Encrypt.c
@@ -1103,30 +1103,4 @@ HCOSE_RECIPIENT COSE_Enveloped_GetRecipient(HCOSE_ENVELOPED cose,
 	return (HCOSE_RECIPIENT)p;
 }
 
-#if USE_COUNTER_SIGNATURES
-bool COSE_Enveloped_AddCounterSigner(HCOSE_ENCRYPT hEnv,
-	HCOSE_COUNTERSIGN hSign,
-	cose_errback *perr)
-{
-	CHECK_CONDITION(IsValidEncryptHandle(hEnv), COSE_ERR_INVALID_HANDLE);
-	return _COSE_CounterSign_add(
-		&((COSE_Enveloped *)hEnv)->m_message, hSign, perr);
-
-errorReturn:
-	return false;
-}
-
-HCOSE_COUNTERSIGN COSE_Enveloped_GetCounterSigner(HCOSE_ENCRYPT h,
-	int iSigner,
-	cose_errback *perr)
-{
-	CHECK_CONDITION(IsValidEncryptHandle(h), COSE_ERR_INVALID_HANDLE);
-	return _COSE_CounterSign_get(
-		&((COSE_Enveloped *)h)->m_message, iSigner, perr);
-
-errorReturn:
-	return NULL;
-}
-#endif
-
 #endif
diff --git a/test/test.c b/test/test.c
@@ -473,6 +473,7 @@ bool SetAttributes(HCOSE hHandle,
 				assert(false);
 				break;
 		}
+		//  If you uncomment this then the memory test will fail.
 		// assert(fRet);
 	}