From c5fdf9acc4ec48cd0a0161a296eebe1baba32b76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se> Date: Wed, 12 Feb 1997 07:23:56 +0100 Subject: [PATCH] Define EXTRACT_UCHAR if needed Rev: src/modules/_Crypto/lib/sha.c:1.3 --- src/modules/_Crypto/lib/sha.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/modules/_Crypto/lib/sha.c b/src/modules/_Crypto/lib/sha.c index 3e639e8bb6..b248bfbb78 100644 --- a/src/modules/_Crypto/lib/sha.c +++ b/src/modules/_Crypto/lib/sha.c @@ -29,8 +29,8 @@ SHA or whether it's simply a bandaid which fixes the problem with a minimum of effort (for example the reengineering of a great many Capstone chips). */ -#include "types.h" -#include "port.h" +#include "crypto_types.h" +/* #include "port.h" */ #include "sha.h" void sha_copy(struct sha_ctx *dest, struct sha_ctx *src) @@ -238,12 +238,14 @@ static void sha_transform(struct sha_ctx *ctx, unsigned INT32 *data ) } #if 1 +#ifndef EXTRACT_UCHAR +#define EXTRACT_UCHAR(p) (*(unsigned char *)(p)) + #define STRING2INT(s) ((((((EXTRACT_UCHAR(s) << 8) \ | EXTRACT_UCHAR(s+1)) << 8) \ | EXTRACT_UCHAR(s+2)) << 8) \ | EXTRACT_UCHAR(s+3)) #else - unsigned INT32 STRING2INT(unsigned INT8 *s) { unsigned INT32 r; -- GitLab