fix openssl headers conflicting with custom SHA1 implementations
[git/git.git] / pack-write.c
index 3621f1d..b426006 100644 (file)
@@ -25,7 +25,7 @@ char *write_idx_file(char *index_name, struct pack_idx_entry **objects,
        off_t last_obj_offset = 0;
        uint32_t array[256];
        int i, fd;
        off_t last_obj_offset = 0;
        uint32_t array[256];
        int i, fd;
-       SHA_CTX ctx;
+       git_SHA_CTX ctx;
        uint32_t index_version;
 
        if (nr_objects) {
        uint32_t index_version;
 
        if (nr_objects) {
@@ -86,7 +86,7 @@ char *write_idx_file(char *index_name, struct pack_idx_entry **objects,
        sha1write(f, array, 256 * 4);
 
        /* compute the SHA1 hash of sorted object names. */
        sha1write(f, array, 256 * 4);
 
        /* compute the SHA1 hash of sorted object names. */
-       SHA1_Init(&ctx);
+       git_SHA1_Init(&ctx);
 
        /*
         * Write the actual SHA1 entries..
 
        /*
         * Write the actual SHA1 entries..
@@ -99,7 +99,7 @@ char *write_idx_file(char *index_name, struct pack_idx_entry **objects,
                        sha1write(f, &offset, 4);
                }
                sha1write(f, obj->sha1, 20);
                        sha1write(f, &offset, 4);
                }
                sha1write(f, obj->sha1, 20);
-               SHA1_Update(&ctx, obj->sha1, 20);
+               git_SHA1_Update(&ctx, obj->sha1, 20);
        }
 
        if (index_version >= 2) {
        }
 
        if (index_version >= 2) {
@@ -140,7 +140,7 @@ char *write_idx_file(char *index_name, struct pack_idx_entry **objects,
 
        sha1write(f, sha1, 20);
        sha1close(f, NULL, CSUM_FSYNC);
 
        sha1write(f, sha1, 20);
        sha1close(f, NULL, CSUM_FSYNC);
-       SHA1_Final(sha1, &ctx);
+       git_SHA1_Final(sha1, &ctx);
        return index_name;
 }
 
        return index_name;
 }
 
@@ -168,12 +168,12 @@ void fixup_pack_header_footer(int pack_fd,
                         off_t partial_pack_offset)
 {
        int aligned_sz, buf_sz = 8 * 1024;
                         off_t partial_pack_offset)
 {
        int aligned_sz, buf_sz = 8 * 1024;
-       SHA_CTX old_sha1_ctx, new_sha1_ctx;
+       git_SHA_CTX old_sha1_ctx, new_sha1_ctx;
        struct pack_header hdr;
        char *buf;
 
        struct pack_header hdr;
        char *buf;
 
-       SHA1_Init(&old_sha1_ctx);
-       SHA1_Init(&new_sha1_ctx);
+       git_SHA1_Init(&old_sha1_ctx);
+       git_SHA1_Init(&new_sha1_ctx);
 
        if (lseek(pack_fd, 0, SEEK_SET) != 0)
                die("Failed seeking to start of %s: %s", pack_name, strerror(errno));
 
        if (lseek(pack_fd, 0, SEEK_SET) != 0)
                die("Failed seeking to start of %s: %s", pack_name, strerror(errno));
@@ -181,9 +181,9 @@ void fixup_pack_header_footer(int pack_fd,
                die("Unable to reread header of %s: %s", pack_name, strerror(errno));
        if (lseek(pack_fd, 0, SEEK_SET) != 0)
                die("Failed seeking to start of %s: %s", pack_name, strerror(errno));
                die("Unable to reread header of %s: %s", pack_name, strerror(errno));
        if (lseek(pack_fd, 0, SEEK_SET) != 0)
                die("Failed seeking to start of %s: %s", pack_name, strerror(errno));
-       SHA1_Update(&old_sha1_ctx, &hdr, sizeof(hdr));
+       git_SHA1_Update(&old_sha1_ctx, &hdr, sizeof(hdr));
        hdr.hdr_entries = htonl(object_count);
        hdr.hdr_entries = htonl(object_count);
-       SHA1_Update(&new_sha1_ctx, &hdr, sizeof(hdr));
+       git_SHA1_Update(&new_sha1_ctx, &hdr, sizeof(hdr));
        write_or_die(pack_fd, &hdr, sizeof(hdr));
        partial_pack_offset -= sizeof(hdr);
 
        write_or_die(pack_fd, &hdr, sizeof(hdr));
        partial_pack_offset -= sizeof(hdr);
 
@@ -198,7 +198,7 @@ void fixup_pack_header_footer(int pack_fd,
                        break;
                if (n < 0)
                        die("Failed to checksum %s: %s", pack_name, strerror(errno));
                        break;
                if (n < 0)
                        die("Failed to checksum %s: %s", pack_name, strerror(errno));
-               SHA1_Update(&new_sha1_ctx, buf, n);
+               git_SHA1_Update(&new_sha1_ctx, buf, n);
 
                aligned_sz -= n;
                if (!aligned_sz)
 
                aligned_sz -= n;
                if (!aligned_sz)
@@ -207,11 +207,11 @@ void fixup_pack_header_footer(int pack_fd,
                if (!partial_pack_sha1)
                        continue;
 
                if (!partial_pack_sha1)
                        continue;
 
-               SHA1_Update(&old_sha1_ctx, buf, n);
+               git_SHA1_Update(&old_sha1_ctx, buf, n);
                partial_pack_offset -= n;
                if (partial_pack_offset == 0) {
                        unsigned char sha1[20];
                partial_pack_offset -= n;
                if (partial_pack_offset == 0) {
                        unsigned char sha1[20];
-                       SHA1_Final(sha1, &old_sha1_ctx);
+                       git_SHA1_Final(sha1, &old_sha1_ctx);
                        if (hashcmp(sha1, partial_pack_sha1) != 0)
                                die("Unexpected checksum for %s "
                                    "(disk corruption?)", pack_name);
                        if (hashcmp(sha1, partial_pack_sha1) != 0)
                                die("Unexpected checksum for %s "
                                    "(disk corruption?)", pack_name);
@@ -220,7 +220,7 @@ void fixup_pack_header_footer(int pack_fd,
                         * pack, which also means making partial_pack_offset
                         * big enough not to matter anymore.
                         */
                         * pack, which also means making partial_pack_offset
                         * big enough not to matter anymore.
                         */
-                       SHA1_Init(&old_sha1_ctx);
+                       git_SHA1_Init(&old_sha1_ctx);
                        partial_pack_offset = ~partial_pack_offset;
                        partial_pack_offset -= MSB(partial_pack_offset, 1);
                }
                        partial_pack_offset = ~partial_pack_offset;
                        partial_pack_offset -= MSB(partial_pack_offset, 1);
                }
@@ -228,8 +228,8 @@ void fixup_pack_header_footer(int pack_fd,
        free(buf);
 
        if (partial_pack_sha1)
        free(buf);
 
        if (partial_pack_sha1)
-               SHA1_Final(partial_pack_sha1, &old_sha1_ctx);
-       SHA1_Final(new_pack_sha1, &new_sha1_ctx);
+               git_SHA1_Final(partial_pack_sha1, &old_sha1_ctx);
+       git_SHA1_Final(new_pack_sha1, &new_sha1_ctx);
        write_or_die(pack_fd, new_pack_sha1, 20);
        fsync_or_die(pack_fd, pack_name);
 }
        write_or_die(pack_fd, new_pack_sha1, 20);
        fsync_or_die(pack_fd, pack_name);
 }