Security-55471.14.8.tar.gz

[apple/security.git] / libsecurity_apple_x509_cl / lib / clNameUtils.cpp

diff --git a/libsecurity_apple_x509_cl/lib/clNameUtils.cpp b/libsecurity_apple_x509_cl/lib/clNameUtils.cpp
index 27f9e5018c908ee44ceea02e9cc30153d0092084..0c88a1eba21c4f93cf35b5e025dbff649539a871 100644 (file)
--- a/libsecurity_apple_x509_cl/lib/clNameUtils.cpp
+++ b/libsecurity_apple_x509_cl/lib/clNameUtils.cpp
@@ -29,7 +29,7 @@
 /* 
  * NSS_ATV --> CSSM_X509_TYPE_VALUE_PAIR
  */
 /* 
  * NSS_ATV --> CSSM_X509_TYPE_VALUE_PAIR
  */

-
+static

 void CL_nssAtvToCssm(
        const NSS_ATV                           &nssObj,
        CSSM_X509_TYPE_VALUE_PAIR       &cssmObj,
 void CL_nssAtvToCssm(
        const NSS_ATV                           &nssObj,
        CSSM_X509_TYPE_VALUE_PAIR       &cssmObj,


@@ -214,7 +214,7 @@ void CL_normalizeString(
                }
        };
 
                }
        };
 

-       strLen = pD - strPtr;
+       strLen = (int)(pD - strPtr);

 }
 
 /* 
 }
 
 /* 


@@ -266,7 +266,7 @@ void CL_normalizeX509NameNSS(
 
                        /* normalize */
                        char *strPtr = (char *)attrVal.item.Data;
 
                        /* normalize */
                        char *strPtr = (char *)attrVal.item.Data;

-                       int newLen = attrVal.item.Length;
+                       int newLen = (int)attrVal.item.Length;

                        CL_normalizeString(strPtr, newLen);
                        
                        /* possible length adjustment */
                        CL_normalizeString(strPtr, newLen);
                        
                        /* possible length adjustment */