soutade/KissCount
1
0
Fork 0
Code Issues Pull Requests Packages Releases 1 Wiki Activity

Use extern "C" for sha1

Browse Source
This commit is contained in:
Grégory Soutadé 2011-08-14 17:53:30 +02:00
parent 66a60bf7a6
commit 43b2b3ccf6
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sha1.cpp
View File

@ -27,9 +27,9 @@
/* this is only to get definitions for memcpy(), ntohl() and htonl() */ /* this is only to get definitions for memcpy(), ntohl() and htonl() */
//#include "../git-compat-util.h" //#include "../git-compat-util.h"
extern "C" {
#include <string.h> #include <string.h>
#include "sha1.h" #include "sha1.h"
#ifndef WIN32 #ifndef WIN32
#include <arpa/inet.h> #include <arpa/inet.h>
#else #else
@ -326,3 +326,4 @@ void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX *ctx)
for (i = 0; i < 5; i++) for (i = 0; i < 5; i++)
put_be32(hashout + i*4, ctx->H[i]); put_be32(hashout + i*4, ctx->H[i]);
} }
}

14
src/sha1.h
View File

@ -25,17 +25,21 @@
* none of the original Mozilla code remains. * none of the original Mozilla code remains.
*/ */
typedef struct { extern "C" {
typedef struct {
unsigned long long size; unsigned long long size;
unsigned int H[5]; unsigned int H[5];
unsigned int W[16]; unsigned int W[16];
} blk_SHA_CTX; } blk_SHA_CTX;
void blk_SHA1_Init(blk_SHA_CTX *ctx); void blk_SHA1_Init(blk_SHA_CTX *ctx);
void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *dataIn, unsigned long len); void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *dataIn, unsigned long len);
void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX *ctx); void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX *ctx);
#define git_SHA_CTX blk_SHA_CTX #define git_SHA_CTX blk_SHA_CTX
#define git_SHA1_Init blk_SHA1_Init #define git_SHA1_Init blk_SHA1_Init
#define git_SHA1_Update blk_SHA1_Update #define git_SHA1_Update blk_SHA1_Update
#define git_SHA1_Final blk_SHA1_Final #define git_SHA1_Final blk_SHA1_Final
}