mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +01:00
9126f0091f
On ARM I have the following compilation errors:
CC fast-import.o
In file included from cache.h:8,
from builtin.h:6,
from fast-import.c:142:
arm/sha1.h:14: error: conflicting types for 'SHA_CTX'
/usr/include/openssl/sha.h:105: error: previous declaration of 'SHA_CTX' was here
arm/sha1.h:16: error: conflicting types for 'SHA1_Init'
/usr/include/openssl/sha.h:115: error: previous declaration of 'SHA1_Init' was here
arm/sha1.h:17: error: conflicting types for 'SHA1_Update'
/usr/include/openssl/sha.h:116: error: previous declaration of 'SHA1_Update' was here
arm/sha1.h:18: error: conflicting types for 'SHA1_Final'
/usr/include/openssl/sha.h:117: error: previous declaration of 'SHA1_Final' was here
make: *** [fast-import.o] Error 1
This is because openssl header files are always included in
git-compat-util.h since commit 684ec6c63c whenever NO_OPENSSL is not
set, which somehow brings in <openssl/sha1.h> clashing with the custom
ARM version. Compilation of git is probably broken on PPC too for the
same reason.
Turns out that the only file requiring openssl/ssl.h and openssl/err.h
is imap-send.c. But only moving those problematic includes there
doesn't solve the issue as it also includes cache.h which brings in the
conflicting local SHA1 header file.
As suggested by Jeff King, the best solution is to rename our references
to SHA1 functions and structure to something git specific, and define those
according to the implementation used.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
72 lines
1.4 KiB
C
72 lines
1.4 KiB
C
/*
|
|
* SHA-1 implementation.
|
|
*
|
|
* Copyright (C) 2005 Paul Mackerras <paulus@samba.org>
|
|
*
|
|
* This version assumes we are running on a big-endian machine.
|
|
* It calls an external sha1_core() to process blocks of 64 bytes.
|
|
*/
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include "sha1.h"
|
|
|
|
extern void ppc_sha1_core(uint32_t *hash, const unsigned char *p,
|
|
unsigned int nblocks);
|
|
|
|
int ppc_SHA1_Init(ppc_SHA_CTX *c)
|
|
{
|
|
c->hash[0] = 0x67452301;
|
|
c->hash[1] = 0xEFCDAB89;
|
|
c->hash[2] = 0x98BADCFE;
|
|
c->hash[3] = 0x10325476;
|
|
c->hash[4] = 0xC3D2E1F0;
|
|
c->len = 0;
|
|
c->cnt = 0;
|
|
return 0;
|
|
}
|
|
|
|
int ppc_SHA1_Update(ppc_SHA_CTX *c, const void *ptr, unsigned long n)
|
|
{
|
|
unsigned long nb;
|
|
const unsigned char *p = ptr;
|
|
|
|
c->len += (uint64_t) n << 3;
|
|
while (n != 0) {
|
|
if (c->cnt || n < 64) {
|
|
nb = 64 - c->cnt;
|
|
if (nb > n)
|
|
nb = n;
|
|
memcpy(&c->buf.b[c->cnt], p, nb);
|
|
if ((c->cnt += nb) == 64) {
|
|
ppc_sha1_core(c->hash, c->buf.b, 1);
|
|
c->cnt = 0;
|
|
}
|
|
} else {
|
|
nb = n >> 6;
|
|
ppc_sha1_core(c->hash, p, nb);
|
|
nb <<= 6;
|
|
}
|
|
n -= nb;
|
|
p += nb;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int ppc_SHA1_Final(unsigned char *hash, ppc_SHA_CTX *c)
|
|
{
|
|
unsigned int cnt = c->cnt;
|
|
|
|
c->buf.b[cnt++] = 0x80;
|
|
if (cnt > 56) {
|
|
if (cnt < 64)
|
|
memset(&c->buf.b[cnt], 0, 64 - cnt);
|
|
ppc_sha1_core(c->hash, c->buf.b, 1);
|
|
cnt = 0;
|
|
}
|
|
if (cnt < 56)
|
|
memset(&c->buf.b[cnt], 0, 56 - cnt);
|
|
c->buf.l[7] = c->len;
|
|
ppc_sha1_core(c->hash, c->buf.b, 1);
|
|
memcpy(hash, c->hash, 20);
|
|
return 0;
|
|
}
|