Security-55471.14.8.tar.gz

[apple/security.git] / libsecurity_apple_csp / lib / FEESignatureObject.cpp

diff --git a/libsecurity_apple_csp/lib/FEESignatureObject.cpp b/libsecurity_apple_csp/lib/FEESignatureObject.cpp
index 12bdfecd680d5f6625ccb1c5611e70ecf53bf8ce..74fa0959fc67a8be85474b1f30a3246ceb2dc479 100644 (file)
--- a/libsecurity_apple_csp/lib/FEESignatureObject.cpp
+++ b/libsecurity_apple_csp/lib/FEESignatureObject.cpp
@@ -99,7 +99,7 @@ void CryptKit::FEERawSigner::sign(
        feeSig                  fsig;
        feeReturn               frtn;
        unsigned char   *feeSig;
        feeSig                  fsig;
        feeReturn               frtn;
        unsigned char   *feeSig;

-       unsigned                feeSigLen;
+       unsigned                feeSigLen=0;

        
        if(mFeeKey == NULL) {
                throwCryptKit(FR_BadPubKey, "FEERawSigner::sign (no key)");
        
        if(mFeeKey == NULL) {
                throwCryptKit(FR_BadPubKey, "FEERawSigner::sign (no key)");


@@ -110,7 +110,7 @@ void CryptKit::FEERawSigner::sign(
        }
        frtn = feeSigSign(fsig,
                (unsigned char *)data,
        }
        frtn = feeSigSign(fsig,
                (unsigned char *)data,

-               dataLen,
+               (unsigned)dataLen,

                mFeeKey);
        if(frtn == FR_Success) {
                frtn = feeSigData(fsig, &feeSig, &feeSigLen);
                mFeeKey);
        if(frtn == FR_Success) {
                frtn = feeSigData(fsig, &feeSig, &feeSigLen);


@@ -149,7 +149,7 @@ void CryptKit::FEERawSigner::verify(
        }
        frtn = feeSigVerify(fsig,
                (unsigned char *)data,
        }
        frtn = feeSigVerify(fsig,
                (unsigned char *)data,

-               dataLen,
+               (unsigned int)dataLen,

                mFeeKey);
        feeSigFree(fsig);
        if(frtn) {
                mFeeKey);
        feeSigFree(fsig);
        if(frtn) {


@@ -186,7 +186,7 @@ void CryptKit::FEEECDSASigner::sign(
        }
        frtn = feeECDSASign(mFeeKey,
                (unsigned char *)data,   // data to be signed
        }
        frtn = feeECDSASign(mFeeKey,
                (unsigned char *)data,   // data to be signed

-               dataLen,                                // in bytes
+               (unsigned int)dataLen,                          // in bytes

                mRandFcn, 
                mRandRef,
                &feeSig,
                mRandFcn, 
                mRandRef,
                &feeSig,


@@ -220,7 +220,7 @@ void CryptKit::FEEECDSASigner::verify(
        frtn = feeECDSAVerify((unsigned char *)sig,
                sigLen,
                (unsigned char *)data,
        frtn = feeECDSAVerify((unsigned char *)sig,
                sigLen,
                (unsigned char *)data,

-               dataLen,
+               (unsigned int)dataLen,

                mFeeKey);
        if(frtn) {
                throwCryptKit(frtn, NULL);
                mFeeKey);
        if(frtn) {
                throwCryptKit(frtn, NULL);