Security-55471.14.8.tar.gz

[apple/security.git] / libsecurity_ocspd / common / ocspResponse.cpp

diff --git a/libsecurity_ocspd/common/ocspResponse.cpp b/libsecurity_ocspd/common/ocspResponse.cpp
index 8b4cb16f17706f61a439ba408af432c90786444e..05ffc186d10e917276b01ce882f59f377c707aa3 100644 (file)
--- a/libsecurity_ocspd/common/ocspResponse.cpp
+++ b/libsecurity_ocspd/common/ocspResponse.cpp
@@ -108,9 +108,9 @@ const CSSM_DATA *OCSPClientCertID::encode()
        certID.algId.parameters.Length = sizeof(nullParam);
 
        /* SHA1(issuerName) */
        certID.algId.parameters.Length = sizeof(nullParam);
 
        /* SHA1(issuerName) */

-       ocspdSha1(mIssuerName.Data, mIssuerName.Length, issuerNameHash);
+       ocspdSha1(mIssuerName.Data, (CC_LONG)mIssuerName.Length, issuerNameHash);

        /* SHA1(issuer public key) */
        /* SHA1(issuer public key) */

-       ocspdSha1(mIssuerPubKey.Data, mIssuerPubKey.Length, pubKeyHash);
+       ocspdSha1(mIssuerPubKey.Data, (CC_LONG)mIssuerPubKey.Length, pubKeyHash);

        
        /* build the CertID from those components */
        certID.issuerNameHash.Data = issuerNameHash;
        
        /* build the CertID from those components */
        certID.issuerNameHash.Data = issuerNameHash;


@@ -171,11 +171,11 @@ bool OCSPClientCertID::compareToExist(
        }
        
        /* generate digests using exist's hash algorithm */
        }
        
        /* generate digests using exist's hash algorithm */

-       hf(mIssuerName.Data, mIssuerName.Length, digest);
+       hf(mIssuerName.Data, (CC_LONG)mIssuerName.Length, digest);

        if(!ocspdCompareCssmData(&digestData, &exist.issuerNameHash)) {
                return false;
        }
        if(!ocspdCompareCssmData(&digestData, &exist.issuerNameHash)) {
                return false;
        }

-       hf(mIssuerPubKey.Data, mIssuerPubKey.Length, digest);
+       hf(mIssuerPubKey.Data, (CC_LONG)mIssuerPubKey.Length, digest);

        if(!ocspdCompareCssmData(&digestData, &exist.issuerPubKeyHash)) {
                return false;
        }
        if(!ocspdCompareCssmData(&digestData, &exist.issuerPubKeyHash)) {
                return false;
        }


@@ -260,11 +260,13 @@ OCSPSingleResponse::~OCSPSingleResponse()
 }
 
 /*** Extensions-specific accessors ***/
 }
 
 /*** Extensions-specific accessors ***/

+#if 0 /* unused ? */

 const CSSM_DATA *OCSPSingleResponse::*crlUrl()
 {
        /* TBD */
        return NULL;
 }
 const CSSM_DATA *OCSPSingleResponse::*crlUrl()
 {
        /* TBD */
        return NULL;
 }

+#endif

 
 const CSSM_DATA *OCSPSingleResponse::crlNum()
 {
 
 const CSSM_DATA *OCSPSingleResponse::crlNum()
 {