Security-59754.80.3.tar.gz

[apple/security.git] / OSX / libsecurity_sd_cspdl / lib / SDContext.cpp

diff --git a/OSX/libsecurity_sd_cspdl/lib/SDContext.cpp b/OSX/libsecurity_sd_cspdl/lib/SDContext.cpp
index 27881a9e4fdc5d5e92f0a2c90a51db248fd82afd..788b0b3fda07cd2c937bbf7d43aaa8eb06bb370f 100644 (file)
--- a/OSX/libsecurity_sd_cspdl/lib/SDContext.cpp
+++ b/OSX/libsecurity_sd_cspdl/lib/SDContext.cpp
@@ -31,7 +31,7 @@
 #include "SDKey.h"
 #include <security_utilities/debugging.h>
 
 #include "SDKey.h"
 #include <security_utilities/debugging.h>
 

-#define ssCryptDebug(args...)  secdebug("ssCrypt", ## args)
+#define ssCryptDebug(args...)  secinfo("ssCrypt", ## args)

 
 using namespace SecurityServer;
 
 
 using namespace SecurityServer;
 


@@ -169,6 +169,22 @@ void SDSignatureContext::init(const Context &context, bool signing)
                        mDigestAlg = CSSM_ALGID_MD2;
                        mSigAlg = CSSM_ALGID_RSA;
                        break;
                        mDigestAlg = CSSM_ALGID_MD2;
                        mSigAlg = CSSM_ALGID_RSA;
                        break;

+               case CSSM_ALGID_SHA224WithRSA:
+                       mDigestAlg = CSSM_ALGID_SHA224;
+                       mSigAlg = CSSM_ALGID_RSA;
+                       break;
+               case CSSM_ALGID_SHA256WithRSA:
+                       mDigestAlg = CSSM_ALGID_SHA256;
+                       mSigAlg = CSSM_ALGID_RSA;
+                       break;
+               case CSSM_ALGID_SHA384WithRSA:
+                       mDigestAlg = CSSM_ALGID_SHA384;
+                       mSigAlg = CSSM_ALGID_RSA;
+                       break;
+               case CSSM_ALGID_SHA512WithRSA:
+                       mDigestAlg = CSSM_ALGID_SHA512;
+                       mSigAlg = CSSM_ALGID_RSA;
+                       break;

                case CSSM_ALGID_RSA:                            // Raw
                        mDigestAlg = CSSM_ALGID_NONE;
                        mSigAlg = CSSM_ALGID_RSA;
                case CSSM_ALGID_RSA:                            // Raw
                        mDigestAlg = CSSM_ALGID_NONE;
                        mSigAlg = CSSM_ALGID_RSA;


@@ -470,7 +486,7 @@ SDCryptContext::final(CssmData &out)
        if(!inSize) return;
 
        const CssmData in(const_cast<void *>(mNullDigest.digestPtr()), inSize);
        if(!inSize) return;
 
        const CssmData in(const_cast<void *>(mNullDigest.digestPtr()), inSize);

-       IFDEBUG(size_t origOutSize = out.length());
+       size_t origOutSize = out.length();

        if (encoding()) {
                clientSession().encrypt(*mContext, mKeyHandle, in, out);
        }
        if (encoding()) {
                clientSession().encrypt(*mContext, mKeyHandle, in, out);
        }