Security-55471.14.8.tar.gz

[apple/security.git] / libsecurity_cssm / lib / transition.cpp

diff --git a/libsecurity_cssm/lib/transition.cpp b/libsecurity_cssm/lib/transition.cpp
index 7b2165812c4e774d1d073d05140539a6c3ea3373..b57487a13a5632d3f2f244370d861f547ae0d59c 100644 (file)
--- a/libsecurity_cssm/lib/transition.cpp
+++ b/libsecurity_cssm/lib/transition.cpp
@@ -173,7 +173,7 @@ CSSM_CSP_CreateRandomGenContext (CSSM_CSP_HANDLE CSPHandle,
     maker.setup(Length, CSSMERR_CSP_INVALID_ATTR_OUTPUT_SIZE);
     maker.make();
     maker.put(CSSM_ATTRIBUTE_SEED, Seed);
     maker.setup(Length, CSSMERR_CSP_INVALID_ATTR_OUTPUT_SIZE);
     maker.make();
     maker.put(CSSM_ATTRIBUTE_SEED, Seed);

-    maker.put(CSSM_ATTRIBUTE_OUTPUT_SIZE, Length);
+    maker.put(CSSM_ATTRIBUTE_OUTPUT_SIZE, (uint32_t)Length);

     Required(NewContextHandle) = maker(CSSM_ALGCLASS_RANDOMGEN, AlgorithmID);
     END_API(CSSM)
 }
     Required(NewContextHandle) = maker(CSSM_ALGCLASS_RANDOMGEN, AlgorithmID);
     END_API(CSSM)
 }


@@ -291,7 +291,8 @@ CSSM_GetContext (CSSM_CC_HANDLE CCHandle,
                  CSSM_CONTEXT_PTR *ContextP)
 {
     BEGIN_API
                  CSSM_CONTEXT_PTR *ContextP)
 {
     BEGIN_API

-    HandleContext &context = HandleObject::find<HandleContext>(CCHandle, CSSM_ERRCODE_INVALID_CONTEXT_HANDLE);
+#warning Cast from CSSM_CC_HANDLE to CSSM_HANDLE
+    HandleContext &context = HandleObject::find<HandleContext>((CSSM_HANDLE)CCHandle, CSSM_ERRCODE_INVALID_CONTEXT_HANDLE);

     Context *newContext = new(context.attachment) Context(context.type(), context.algorithm());
     try {
         newContext->CSPHandle = context.attachment.handle();
     Context *newContext = new(context.attachment) Context(context.type(), context.algorithm());
     try {
         newContext->CSPHandle = context.attachment.handle();


@@ -325,7 +326,8 @@ CSSM_SetContext (CSSM_CC_HANDLE CCHandle,
 {
     BEGIN_API
     const Context &source = Context::required(ContextP);
 {
     BEGIN_API
     const Context &source = Context::required(ContextP);

-    HandleContext &context = HandleObject::find<HandleContext>(CCHandle, CSSM_ERRCODE_INVALID_CONTEXT_HANDLE);
+#warning Cast from CSSM_CC_HANDLE to CSSM_HANDLE
+    HandleContext &context = HandleObject::find<HandleContext>((CSSM_HANDLE)CCHandle, CSSM_ERRCODE_INVALID_CONTEXT_HANDLE);

 
     CSSM_CONTEXT_ATTRIBUTE *oldAttributes = context.ContextAttributes;
     uint32 oldCount = context.NumberOfAttributes;
 
     CSSM_CONTEXT_ATTRIBUTE *oldAttributes = context.ContextAttributes;
     uint32 oldCount = context.NumberOfAttributes;


@@ -390,7 +392,8 @@ CSSM_UpdateContextAttributes (CSSM_CC_HANDLE CCHandle,
                               const CSSM_CONTEXT_ATTRIBUTE *ContextAttributes)
 {
     BEGIN_API
                               const CSSM_CONTEXT_ATTRIBUTE *ContextAttributes)
 {
     BEGIN_API

-    HandleContext &context = HandleObject::find<HandleContext>(CCHandle, CSSM_ERRCODE_INVALID_CONTEXT_HANDLE);
+#warning Cast from CSSM_CC_HANDLE to CSSM_HANDLE
+    HandleContext &context = HandleObject::find<HandleContext>((CSSM_HANDLE)CCHandle, CSSM_ERRCODE_INVALID_CONTEXT_HANDLE);

     context.mergeAttributes(ContextAttributes, NumberAttributes);
     END_API(CSSM)
 }
     context.mergeAttributes(ContextAttributes, NumberAttributes);
     END_API(CSSM)
 }


@@ -405,7 +408,8 @@ CSSM_DeleteContextAttributes (CSSM_CC_HANDLE CCHandle,
     if (NumberOfAttributes == 0)
         return CSSM_OK;        // I suppose
     Required(ContextAttributes); // preflight
     if (NumberOfAttributes == 0)
         return CSSM_OK;        // I suppose
     Required(ContextAttributes); // preflight

-    HandleContext &context = HandleObject::find<HandleContext>(CCHandle, CSSM_ERRCODE_INVALID_CONTEXT_HANDLE);
+#warning Cast from CSSM_CC_HANDLE to CSSM_HANDLE
+    HandleContext &context = HandleObject::find<HandleContext>((CSSM_HANDLE)CCHandle, CSSM_ERRCODE_INVALID_CONTEXT_HANDLE);

     for (uint32 n = 0; n < NumberOfAttributes; n++)
         context.deleteAttribute(ContextAttributes[n].AttributeType);
     END_API(CSSM)
     for (uint32 n = 0; n < NumberOfAttributes; n++)
         context.deleteAttribute(ContextAttributes[n].AttributeType);
     END_API(CSSM)


@@ -421,7 +425,8 @@ CSSM_DigestDataClone (CSSM_CC_HANDLE ccHandle,
                       CSSM_CC_HANDLE *newCCHandle)
 {
        BEGIN_API
                       CSSM_CC_HANDLE *newCCHandle)
 {
        BEGIN_API

-    HandleContext &context = HandleObject::findAndLock<HandleContext>(ccHandle, CSSM_ERRCODE_INVALID_CONTEXT_HANDLE);
+#warning Cast from CSSM_CC_HANDLE to CSSM_HANDLE
+    HandleContext &context = HandleObject::findAndLock<HandleContext>((CSSM_HANDLE)ccHandle, CSSM_ERRCODE_INVALID_CONTEXT_HANDLE);

        TransitLock _(context.attachment);
     HandleContext *newContext =
        new(context.attachment) HandleContext(context.attachment, context.type(), context.algorithm());
        TransitLock _(context.attachment);
     HandleContext *newContext =
        new(context.attachment) HandleContext(context.attachment, context.type(), context.algorithm());