Security-55471.14.4.tar.gz

[apple/security.git] / libsecurity_cdsa_utils / lib / cuOidParser.cpp

diff --git a/libsecurity_cdsa_utils/lib/cuOidParser.cpp b/libsecurity_cdsa_utils/lib/cuOidParser.cpp
index aa9326ce223cd5dfeca753ac31681e9f30914088..e03f1239307f36abd134b665c4ae0e0cbd863585 100644 (file)
--- a/libsecurity_cdsa_utils/lib/cuOidParser.cpp
+++ b/libsecurity_cdsa_utils/lib/cuOidParser.cpp
@@ -47,6 +47,7 @@ static const char     *OID_DESCR_START = "Description = ";
 /*
  * Read entire file with extra bytes left over in the mallocd buffer. 
  */
+static
 int readFileExtra(
        const char              *fileName,
        unsigned                extraBytes,
@@ -69,17 +70,17 @@ int readFileExtra(
        if(rtn) {
                goto errOut;
        }
-       size = sb.st_size;
+       size = (size_t)sb.st_size;
        buf = (unsigned char *)malloc(size + extraBytes);
        if(buf == NULL) {
                rtn = ENOMEM;
                goto errOut;
        }
-       rtn = lseek(fd, 0, SEEK_SET);
+       rtn = (int)lseek(fd, 0, SEEK_SET);
        if(rtn < 0) {
                goto errOut;
        }
-       rtn = read(fd, buf, (size_t)size);
+       rtn = (int)read(fd, buf, (size_t)size);
        if(rtn != (int)size) {
                if(rtn >= 0) {
                        printf("readFile: short read\n");
@@ -243,7 +244,7 @@ static CSSM_BOOL parseOidWithConfig(
        }
        
        /* caller's string buf = remainder of description line */
-       len = eol - descStart;
+       len = (int)(eol - descStart);
        if(len > (OID_PARSER_STRING_SIZE - 1)) {
                /* fixed-length output buf, avoid overflow */
                len = OID_PARSER_STRING_SIZE - 1;