Changeset 62564 in vbox for trunk/src/VBox/Runtime/common/crypto

Timestamp:

Jul 26, 2016 2:43:03 PM (8 years ago)

Author:

vboxsync

Message:

IPRT: Mark unused parameters.

Location:

trunk/src/VBox/Runtime/common/crypto

Files:

• digest-builtin.cpp (modified) (10 diffs)
• pemfile.cpp (modified) (1 diff)
• pkcs7-asn1-decoder.cpp (modified) (1 diff)
• pkcs7-sanity.cpp (modified) (11 diffs)
• pkcs7-verify.cpp (modified) (3 diffs)
• pkix-signature-rsa.cpp (modified) (5 diffs)
• spc-asn1-decoder.cpp (modified) (1 diff)
• store-inmem.cpp (modified) (1 diff)
• store.cpp (modified) (2 diffs)
• x509-asn1-decoder.cpp (modified) (1 diff)
• x509-certpaths.cpp (modified) (2 diffs)
• x509-sanity.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/common/crypto/digest-builtin.cpp

@@ -64 +64 @@
 static DECLCALLBACK(int) rtCrDigestMd2_Init(void *pvState, void *pvOpaque, bool fReInit)
 {
+    RT_NOREF_PV(fReInit); RT_NOREF_PV(pvOpaque);
     AssertReturn(pvOpaque == NULL, VERR_INVALID_PARAMETER);
     RTMd2Init((PRTMD2CONTEXT)pvState);
@@ -118 +119 @@
 static DECLCALLBACK(int) rtCrDigestMd5_Init(void *pvState, void *pvOpaque, bool fReInit)
 {
+    RT_NOREF_PV(pvOpaque); RT_NOREF_PV(fReInit);
     AssertReturn(pvOpaque == NULL, VERR_INVALID_PARAMETER);
     RTMd5Init((PRTMD5CONTEXT)pvState);
@@ -172 +174 @@
 static DECLCALLBACK(int) rtCrDigestSha1_Init(void *pvState, void *pvOpaque, bool fReInit)
 {
+    RT_NOREF_PV(pvOpaque); RT_NOREF_PV(fReInit);
     AssertReturn(pvOpaque == NULL, VERR_INVALID_PARAMETER);
     RTSha1Init((PRTSHA1CONTEXT)pvState);
@@ -226 +229 @@
 static DECLCALLBACK(int) rtCrDigestSha256_Init(void *pvState, void *pvOpaque, bool fReInit)
 {
+    RT_NOREF_PV(pvOpaque); RT_NOREF_PV(fReInit);
     AssertReturn(pvOpaque == NULL, VERR_INVALID_PARAMETER);
     RTSha256Init((PRTSHA256CONTEXT)pvState);
@@ -279 +283 @@
 static DECLCALLBACK(int) rtCrDigestSha512_Init(void *pvState, void *pvOpaque, bool fReInit)
 {
+    RT_NOREF_PV(pvOpaque); RT_NOREF_PV(fReInit);
     AssertReturn(pvOpaque == NULL, VERR_INVALID_PARAMETER);
     RTSha512Init((PRTSHA512CONTEXT)pvState);
@@ -332 +337 @@
 static DECLCALLBACK(int) rtCrDigestSha224_Init(void *pvState, void *pvOpaque, bool fReInit)
 {
+    RT_NOREF_PV(pvOpaque); RT_NOREF_PV(fReInit);
     AssertReturn(pvOpaque == NULL, VERR_INVALID_PARAMETER);
     RTSha224Init((PRTSHA224CONTEXT)pvState);
@@ -385 +391 @@
 static DECLCALLBACK(int) rtCrDigestSha384_Init(void *pvState, void *pvOpaque, bool fReInit)
 {
+    RT_NOREF_PV(pvOpaque); RT_NOREF_PV(fReInit);
     AssertReturn(pvOpaque == NULL, VERR_INVALID_PARAMETER);
     RTSha384Init((PRTSHA384CONTEXT)pvState);
@@ -439 +446 @@
 static DECLCALLBACK(int) rtCrDigestSha512t224_Init(void *pvState, void *pvOpaque, bool fReInit)
 {
+    RT_NOREF_PV(pvOpaque); RT_NOREF_PV(fReInit);
     AssertReturn(pvOpaque == NULL, VERR_INVALID_PARAMETER);
     RTSha512t224Init((PRTSHA512T224CONTEXT)pvState);
@@ -493 +501 @@
 static DECLCALLBACK(int) rtCrDigestSha512t256_Init(void *pvState, void *pvOpaque, bool fReInit)
 {
+    RT_NOREF_PV(pvOpaque); RT_NOREF_PV(fReInit);
     AssertReturn(pvOpaque == NULL, VERR_INVALID_PARAMETER);
     RTSha512t256Init((PRTSHA512T256CONTEXT)pvState);
@@ -639 +648 @@
 static DECLCALLBACK(RTDIGESTTYPE) rtCrDigestOsslEvp_GetDigestType(void *pvState)
 {
-    //EVP_MD_CTX *pThis = (EVP_MD_CTX *)pvState;
+    RT_NOREF_PV(pvState); //EVP_MD_CTX *pThis = (EVP_MD_CTX *)pvState;
     /** @todo figure which digest algorithm it is! */
     return RTDIGESTTYPE_UNKNOWN;

trunk/src/VBox/Runtime/common/crypto/pemfile.cpp

@@ -334 +334 @@
                                 PCRTCRPEMSECTION *ppSectionHead, PRTERRINFO pErrInfo)
 {
+    RT_NOREF_PV(pErrInfo);
+
     /*
      * Input validation.

trunk/src/VBox/Runtime/common/crypto/pkcs7-asn1-decoder.cpp

@@ -57 +57 @@
                                             const char *pszErrorTag)
 {
+    RT_NOREF_PV(fFlags); RT_NOREF_PV(pszErrorTag);
     pThis->u.pCore = NULL;
 

trunk/src/VBox/Runtime/common/crypto/pkcs7-sanity.cpp

@@ -44 +44 @@
 {
     bool const fAuthenticode = RT_BOOL(fFlags & RTCRPKCS7SIGNEDDATA_SANITY_F_AUTHENTICODE);
+    RT_NOREF_PV(fFlags);
 
     //RTAsn1Dump(&pSignedData->SeqCore.Asn1Core, 0, 0, RTAsn1DumpStrmPrintfV, g_pStdOut);
@@ -61 +62 @@
     if (pSignedData->DigestAlgorithms.cItems != 1 && fAuthenticode)
         return RTErrInfoSetF(pErrInfo, VERR_CR_SPC_NOT_EXACTLY_ONE_DIGEST_ALGO,
-                             "SignedData.DigestAlgorithms has more than one algorithm (%u)",
-                             pSignedData->DigestAlgorithms.cItems);
+                             "%s: SignedData.DigestAlgorithms has more than one algorithm (%u)",
+                             pszErrorTag, pSignedData->DigestAlgorithms.cItems);
 
     if (fFlags & RTCRPKCS7SIGNEDDATA_SANITY_F_ONLY_KNOWN_HASH)
@@ -69 +70 @@
             if (RTCrX509AlgorithmIdentifier_QueryDigestType(&pSignedData->DigestAlgorithms.paItems[i]) == RTDIGESTTYPE_INVALID)
                 return RTErrInfoSetF(pErrInfo, VERR_CR_PKCS7_UNKNOWN_DIGEST_ALGORITHM,
-                                     "SignedData.DigestAlgorithms[%i] is not known: %s",
-                                     i, pSignedData->DigestAlgorithms.paItems[i].Algorithm.szObjId);
+                                     "%s: SignedData.DigestAlgorithms[%i] is not known: %s",
+                                     pszErrorTag, i, pSignedData->DigestAlgorithms.paItems[i].Algorithm.szObjId);
             if (pSignedData->DigestAlgorithms.paItems[i].Parameters.enmType != RTASN1TYPE_NULL)
                 return RTErrInfoSetF(pErrInfo, VERR_CR_PKCS7_DIGEST_PARAMS_NOT_IMPL,
-                                     "SignedData.DigestAlgorithms[%i] has parameters: tag=%u",
-                                     i, pSignedData->DigestAlgorithms.paItems[i].Parameters.u.Core.uTag);
+                                     "%s: SignedData.DigestAlgorithms[%i] has parameters: tag=%u",
+                                     pszErrorTag, i, pSignedData->DigestAlgorithms.paItems[i].Parameters.u.Core.uTag);
         }
 
@@ -82 +83 @@
     if (   (fFlags & RTCRPKCS7SIGNEDDATA_SANITY_F_SIGNING_CERT_PRESENT)
         && pSignedData->Certificates.cItems == 0)
-        return RTErrInfoSet(pErrInfo, VERR_CR_PKCS7_NO_CERTIFICATES,
-                            "SignedData.Certifcates is empty, expected at least one certificate");
+        return RTErrInfoSetF(pErrInfo, VERR_CR_PKCS7_NO_CERTIFICATES,
+                             "%s: SignedData.Certifcates is empty, expected at least one certificate", pszErrorTag);
 
     /*
@@ -89 +90 @@
      */
     if (fAuthenticode && RTAsn1Core_IsPresent(&pSignedData->Crls))
-        return RTErrInfoSet(pErrInfo, VERR_CR_PKCS7_EXPECTED_NO_CRLS,
-                            "SignedData.Crls is not empty as expected for authenticode.");
+        return RTErrInfoSetF(pErrInfo, VERR_CR_PKCS7_EXPECTED_NO_CRLS,
+                             "%s: SignedData.Crls is not empty as expected for authenticode.", pszErrorTag);
     /** @todo check Crls when they become important. */
 
@@ -97 +98 @@
      */
     if (pSignedData->SignerInfos.cItems == 0)
-        return RTErrInfoSet(pErrInfo, VERR_CR_PKCS7_NO_SIGNER_INFOS, "SignedData.SignerInfos is empty?");
+        return RTErrInfoSetF(pErrInfo, VERR_CR_PKCS7_NO_SIGNER_INFOS, "%s: SignedData.SignerInfos is empty?", pszErrorTag);
     if (fAuthenticode && pSignedData->SignerInfos.cItems != 1)
         return RTErrInfoSetF(pErrInfo, VERR_CR_PKCS7_EXPECTED_ONE_SIGNER_INFO,
-                             "SignedData.SignerInfos should have one entry for authenticode: %u",
-                             pSignedData->SignerInfos.cItems);
+                             "%s: SignedData.SignerInfos should have one entry for authenticode: %u",
+                             pszErrorTag, pSignedData->SignerInfos.cItems);
 
     for (uint32_t i = 0; i < pSignedData->SignerInfos.cItems; i++)
@@ -109 +110 @@
         if (RTAsn1Integer_UnsignedCompareWithU32(&pSignerInfo->Version, RTCRPKCS7SIGNERINFO_V1) != 0)
             return RTErrInfoSetF(pErrInfo, VERR_CR_PKCS7_SIGNER_INFO_VERSION,
-                                 "SignedData.SignerInfos[%u] version is %llu, expected %u",
-                                 i, pSignerInfo->Version.uValue.u, RTCRPKCS7SIGNERINFO_V1);
+                                 "%s: SignedData.SignerInfos[%u] version is %llu, expected %u",
+                                 pszErrorTag, i, pSignerInfo->Version.uValue.u, RTCRPKCS7SIGNERINFO_V1);
 
         /* IssuerAndSerialNumber. */
@@ -120 +121 @@
         if (pSignerInfo->IssuerAndSerialNumber.SerialNumber.Asn1Core.cb == 0)
             return RTErrInfoSetF(pErrInfo, VERR_CR_PKCS7_SIGNER_INFO_NO_ISSUER_SERIAL_NO,
-                                 "SignedData.SignerInfos[%u].IssuerAndSerialNumber.SerialNumber is missing (zero length)", i);
+                                 "%s: SignedData.SignerInfos[%u].IssuerAndSerialNumber.SerialNumber is missing (zero length)",
+                                 pszErrorTag, i);
 
         PCRTCRX509CERTIFICATE pCert;
@@ -128 +130 @@
         if (!pCert && (fFlags & RTCRPKCS7SIGNEDDATA_SANITY_F_SIGNING_CERT_PRESENT))
             return RTErrInfoSetF(pErrInfo, VERR_CR_PKCS7_SIGNER_CERT_NOT_SHIPPED,
-                                 "SignedData.SignerInfos[%u].IssuerAndSerialNumber not found in T0.Certificates", i);
+                                 "%s: SignedData.SignerInfos[%u].IssuerAndSerialNumber not found in T0.Certificates",
+                                 pszErrorTag, i);
 
         /* DigestAlgorithm */
@@ -138 +141 @@
         if (j >= pSignedData->DigestAlgorithms.cItems)
             return RTErrInfoSetF(pErrInfo, VERR_CR_PKCS7_DIGEST_ALGO_NOT_FOUND_IN_LIST,
-                                 "SignedData.SignerInfos[%u].DigestAlgorithm (%s) not found in SignedData.DigestAlgorithms",
-                                 i, pSignerInfo->DigestAlgorithm.Algorithm.szObjId);
+                                 "%s: SignedData.SignerInfos[%u].DigestAlgorithm (%s) not found in SignedData.DigestAlgorithms",
+                                 pszErrorTag, i, pSignerInfo->DigestAlgorithm.Algorithm.szObjId);
 
         /* Digest encryption algorithm. */
@@ -163 +166 @@
                 {
                     if (fFoundContentInfo)
-                        return RTErrInfoSet(pErrInfo, VERR_CR_PKCS7_MISSING_CONTENT_TYPE_ATTRIB,
-                                            "Multiple authenticated content-type attributes.");
+                        return RTErrInfoSetF(pErrInfo, VERR_CR_PKCS7_MISSING_CONTENT_TYPE_ATTRIB,
+                                             "%s: Multiple authenticated content-type attributes.", pszErrorTag);
                     fFoundContentInfo = true;
                     AssertReturn(pAttrib->enmType == RTCRPKCS7ATTRIBUTETYPE_OBJ_IDS, VERR_INTERNAL_ERROR_3);
                     if (pAttrib->uValues.pObjIds->cItems != 1)
                         return RTErrInfoSetF(pErrInfo, VERR_CR_PKCS7_BAD_CONTENT_TYPE_ATTRIB,
-                                             "Expected exactly one value for content-type attrib, found: %u",
-                                             pAttrib->uValues.pObjIds->cItems);
+                                             "%s: Expected exactly one value for content-type attrib, found: %u",
+                                             pszErrorTag, pAttrib->uValues.pObjIds->cItems);
                 }
                 else if (RTAsn1ObjId_CompareWithString(&pAttrib->Type, RTCR_PKCS9_ID_MESSAGE_DIGEST_OID) == 0)
                 {
                     if (fFoundMessageDigest)
-                        return RTErrInfoSet(pErrInfo, VERR_CR_PKCS7_MISSING_MESSAGE_DIGEST_ATTRIB,
-                                            "Multiple authenticated message-digest attributes.");
+                        return RTErrInfoSetF(pErrInfo, VERR_CR_PKCS7_MISSING_MESSAGE_DIGEST_ATTRIB,
+                                             "%s: Multiple authenticated message-digest attributes.", pszErrorTag);
                     fFoundMessageDigest = true;
                     AssertReturn(pAttrib->enmType == RTCRPKCS7ATTRIBUTETYPE_OCTET_STRINGS, VERR_INTERNAL_ERROR_3);
                     if (pAttrib->uValues.pOctetStrings->cItems != 1)
                         return RTErrInfoSetF(pErrInfo, VERR_CR_PKCS7_BAD_CONTENT_TYPE_ATTRIB,
-                                             "Expected exactly one value for message-digest attrib, found: %u",
-                                             pAttrib->uValues.pOctetStrings->cItems);
+                                             "%s: Expected exactly one value for message-digest attrib, found: %u",
+                                             pszErrorTag, pAttrib->uValues.pOctetStrings->cItems);
                 }
             }
 
             if (!fFoundContentInfo)
-                return RTErrInfoSet(pErrInfo, VERR_CR_PKCS7_MISSING_CONTENT_TYPE_ATTRIB,
-                                    "Missing authenticated content-type attribute.");
+                return RTErrInfoSetF(pErrInfo, VERR_CR_PKCS7_MISSING_CONTENT_TYPE_ATTRIB,
+                                     "%s: Missing authenticated content-type attribute.", pszErrorTag);
             if (!fFoundMessageDigest)
-                return RTErrInfoSet(pErrInfo, VERR_CR_PKCS7_MISSING_MESSAGE_DIGEST_ATTRIB,
-                                    "Missing authenticated message-digest attribute.");
+                return RTErrInfoSetF(pErrInfo, VERR_CR_PKCS7_MISSING_MESSAGE_DIGEST_ATTRIB,
+                                     "%s: Missing authenticated message-digest attribute.", pszErrorTag);
         }
     }

trunk/src/VBox/Runtime/common/crypto/pkcs7-verify.cpp

@@ -53 +53 @@
                                                  void const *pvContent, uint32_t cbContent, PRTERRINFO pErrInfo)
 {
+    RT_NOREF_PV(fFlags);
+
     /*
      * Verify using OpenSSL.
@@ -149 +151 @@
                                                void *pvUser, PRTERRINFO pErrInfo)
 {
+    RT_NOREF_PV(hCertPaths); RT_NOREF_PV(pvUser);
     int rc = VINF_SUCCESS;
 
@@ -169 +172 @@
                                                    void *pvUser, PRTERRINFO pErrInfo)
 {
+    RT_NOREF_PV(hCertPaths); RT_NOREF_PV(pvUser);
     int rc = VINF_SUCCESS;
     if (fFlags & RTCRPKCS7VCC_F_SIGNED_DATA)

trunk/src/VBox/Runtime/common/crypto/pkix-signature-rsa.cpp

@@ -140 +140 @@
                                                    bool fSigning, PCRTASN1BITSTRING pKey, PCRTASN1DYNTYPE pParams)
 {
+    RT_NOREF_PV(pDesc); RT_NOREF_PV(pvState); RT_NOREF_PV(pvOpaque);
+
     if (pParams)
         return VERR_CR_PKIX_SIGNATURE_TAKES_NO_PARAMETERS;
@@ -199 +201 @@
 {
     PRTCRPKIXSIGNATURERSA pThis = (PRTCRPKIXSIGNATURERSA)pvState;
+    RT_NOREF_PV(fSigning); RT_NOREF_PV(pDesc);
     Assert(pThis->fSigning == fSigning); NOREF(pThis);
     return VINF_SUCCESS;
@@ -208 +211 @@
 {
     PRTCRPKIXSIGNATURERSA pThis = (PRTCRPKIXSIGNATURERSA)pvState;
-    Assert(pThis->fSigning == fSigning); NOREF(pThis);
+    RT_NOREF_PV(fSigning); RT_NOREF_PV(pDesc);
+    Assert(pThis->fSigning == fSigning);
 
     RTBigNumDestroy(&pThis->Modulus);
@@ -297 +301 @@
 {
     PRTCRPKIXSIGNATURERSA pThis = (PRTCRPKIXSIGNATURERSA)pvState;
+    RT_NOREF_PV(pDesc);
     Assert(!pThis->fSigning);
     if (cbSignature > sizeof(pThis->Scratch) / 2)
@@ -386 +391 @@
 {
     PRTCRPKIXSIGNATURERSA pThis = (PRTCRPKIXSIGNATURERSA)pvState;
+    RT_NOREF_PV(pDesc);  RT_NOREF_PV(hDigest); RT_NOREF_PV(pvSignature); RT_NOREF_PV(pcbSignature);
     Assert(pThis->fSigning); NOREF(pThis);
     return VERR_NOT_IMPLEMENTED;

trunk/src/VBox/Runtime/common/crypto/spc-asn1-decoder.cpp

@@ -48 +48 @@
 
 {
+    RT_NOREF_PV(fFlags); RT_NOREF_PV(pszErrorTag);
+
     int rc;
     RTASN1CURSOR SubCursor;

trunk/src/VBox/Runtime/common/crypto/store-inmem.cpp

@@ -228 +228 @@
                                                                uint8_t *pbKey, size_t cbKey, size_t *pcbKeyRet)
 {
+    RT_NOREF_PV(pvProvider); RT_NOREF_PV(pCertCtx); RT_NOREF_PV(pbKey); RT_NOREF_PV(cbKey); RT_NOREF_PV(pcbKeyRet);
     //PRTCRSTOREINMEM pThis = (PRTCRSTOREINMEM)pvProvider;
     return VERR_NOT_FOUND;

trunk/src/VBox/Runtime/common/crypto/store.cpp

@@ -323 +323 @@
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertReturn(pThis->u32Magic == RTCRSTOREINT_MAGIC, VERR_INVALID_HANDLE);
+    RT_NOREF_PV(fFlags);
 
     /*
@@ -376 +377 @@
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertReturn(pThis->u32Magic == RTCRSTOREINT_MAGIC, VERR_INVALID_HANDLE);
+    RT_NOREF_PV(fFlags);
 
     /*

trunk/src/VBox/Runtime/common/crypto/x509-asn1-decoder.cpp

@@ -44 +44 @@
                                                    PRTCRX509EXTENSION pThis, const char *pszErrorTag)
 {
+    RT_NOREF_PV(fFlags); RT_NOREF_PV(pszErrorTag);
+
     pThis->enmValue = RTCRX509EXTENSIONVALUE_UNKNOWN;
 

trunk/src/VBox/Runtime/common/crypto/x509-certpaths.cpp

@@ -750 +750 @@
         pNode = pParent;
     }
+
+    RT_NOREF_PV(pThis);
 }
 
@@ -1137 +1139 @@
                                            uint32_t uVerbosity, PFNRTDUMPPRINTFV pfnPrintfV, void *pvUser)
 {
+    RT_NOREF_PV(pThis);
     rtDumpPrintf(pfnPrintfV, pvUser, "Path #%u: %s, %u deep, rcVerify=%Rrc\n",
                  iPath, RTCRX509CERTPATHNODE_SRC_IS_TRUSTED(pCurLeaf->uSrc) ? "trusted" : "untrusted", pCurLeaf->uDepth,

trunk/src/VBox/Runtime/common/crypto/x509-sanity.cpp

@@ -41 +41 @@
 static int rtCrX509Validity_CheckSanityExtra(PCRTCRX509VALIDITY pThis, uint32_t fFlags, PRTERRINFO pErrInfo, const char *pszErrorTag)
 {
+    RT_NOREF_PV(fFlags);
+
     if (RTAsn1Time_Compare(&pThis->NotBefore, &pThis->NotAfter) > 0)
         return RTErrInfoSetF(pErrInfo, VERR_CR_X509_VALIDITY_SWAPPED, "%s: NotBefore is after NotAfter", pszErrorTag);
@@ -50 +52 @@
 static int rtCrX509Name_CheckSanityExtra(PCRTCRX509NAME pThis, uint32_t fFlags, PRTERRINFO pErrInfo, const char *pszErrorTag)
 {
+    RT_NOREF_PV(fFlags);
+
     if (pThis->cItems == 0)
         return RTErrInfoSetF(pErrInfo, VERR_CR_X509_NAME_EMPTY_SET, "%s: Has no components.", pszErrorTag);
@@ -94 +98 @@
                                                          PRTERRINFO pErrInfo, const char *pszErrorTag)
 {
+    RT_NOREF_PV(fFlags);
     if (pThis->SubjectPublicKey.cBits <= 32)
         return RTErrInfoSetF(pErrInfo, VERR_CR_X509_PUBLIC_KEY_TOO_SMALL,
@@ -104 +109 @@
                                                    PRTERRINFO pErrInfo, const char *pszErrorTag)
 {
+    RT_NOREF_PV(fFlags);
+
     if (   RTAsn1Integer_IsPresent(&pThis->T0.Version)
         && RTAsn1Integer_UnsignedCompareWithU32(&pThis->T0.Version, RTCRX509TBSCERTIFICATE_V1) != 0
@@ -134 +141 @@
                                                PRTERRINFO pErrInfo, const char *pszErrorTag)
 {
+    RT_NOREF_PV(fFlags);
+
     if (RTCrX509AlgorithmIdentifier_Compare(&pThis->SignatureAlgorithm, &pThis->TbsCertificate.Signature) != 0)
         return RTErrInfoSetF(pErrInfo, VERR_CR_X509_CERT_TBS_SIGN_ALGO_MISMATCH,