ref: bf37c640d04807206926a1fe7b7c501db9225452
parent: 950df8201674a19af5fa5ff61ba7b006b0691edb
author: giles <giles@ded80894-8fb9-0310-811b-c03f3676ab4d>
date: Sat Jul 20 12:02:24 EDT 2002
Replace (optional) linking to the openssl implementation of SHA-1, which is not GPL compatible with a native implementation based on Steve Reid's public domain implementation from sea-to-sky.net. Our version remains public domain, but now requires our autotools-generated headers. git-svn-id: http://svn.ghostscript.com/jbig2dec/trunk@146 ded80894-8fb9-0310-811b-c03f3676ab4d
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.8 2002/07/17 13:59:47 giles Exp $
+# $Id: Makefile.am,v 1.9 2002/07/20 16:02:24 giles Exp $
## process this file with automake to generate Makefile.in
lib_LIBRARIES = libjbig2dec.a
@@ -10,12 +10,15 @@
jbig2_generic.c jbig2_mmr.c \
jbig2_image.c jbig2_image_pbm.c
-bin_PROGRAMS = jbig2dec
+bin_PROGRAMS = jbig2dec test_sha1
#noinst_PROGRAMS = test_huffman test_arith
-jbig2dec_SOURCES = jbig2dec.c
+jbig2dec_SOURCES = jbig2dec.c sha1.c
jbig2dec_LDADD = libjbig2dec.a @LIBOBJS@
+test_sha1_SOURCES = sha1.c
+test_sha1_CFLAGS = -DTEST
+
MAINTAINERCLEANFILES = config_types.h.in
-TESTS = test_jbig2dec.py
+TESTS = test_sha1 test_jbig2dec.py
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
AM_INIT_AUTOMAKE([AC_PACKAGE_NAME], [AC_PACKAGE_VERSION])
AM_CONFIG_HEADER(config.h)
-AC_REVISION([$Revision: 1.9 $])
+AC_REVISION([$Revision: 1.10 $])
# Checks for programs.
AC_PROG_CC
@@ -90,6 +90,7 @@
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_SIZE_T
+AC_C_BIGENDIAN
# Checks for library functions.
AC_FUNC_MALLOC
@@ -96,27 +97,6 @@
AC_FUNC_MEMCMP
AC_CHECK_FUNCS([memset strdup])
-dnl use our included md5 if we can't find one
-AC_CHECK_HEADER([openssl/md5.h], [
- AC_CHECK_LIB(crypto, MD5_Init, [
- AC_DEFINE(HAVE_OPENSSL_MD5,,[Define to use of the
- MD5_*() routines from OpenSSL rather than the included ones])
- LIBS="$LIBS -lcrypto"
- ], [
- AC_LIBOBJ([md5])
- ])
-],,[ ])
-
-dnl use our included SHA-1 if we can't find one
-AC_CHECK_HEADER([openssl/sha.h], [
- AC_CHECK_LIB(crypto, SHA1_Init, [
- AC_DEFINE(HAVE_OPENSSL_SHA1,,[Define to use of the
- SHA1_*() routines from OpenSSL rather than the included ones])
- ], [
- AC_LIBOBJ([sha1])
- ])
-],,[ ])
-
dnl use our included getopt if the system doesn't have getopt_long()
AC_CHECK_FUNC(getopt_long,
[AC_DEFINE(HAVE_GETOPT_LONG,,[Define if the local libc includes getopt_long()])],
--- a/jbig2dec.c
+++ b/jbig2dec.c
@@ -8,7 +8,7 @@
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- $Id: jbig2dec.c,v 1.35 2002/07/17 23:59:29 giles Exp $
+ $Id: jbig2dec.c,v 1.36 2002/07/20 16:02:24 giles Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -35,9 +35,7 @@
# include "getopt.h"
#endif
-#ifdef HAVE_OPENSSL_SHA1
-# include <openssl/evp.h>
-#endif
+#include "sha1.h"
typedef enum {usage,dump,render
@@ -46,9 +44,7 @@
typedef struct {jbig2dec_mode mode;
int verbose, hash;
-#ifdef HAVE_OPENSSL_SHA1
- EVP_MD_CTX *hash_ctx;
-#endif
+ SHA1_CTX *hash_ctx;
char *output_file;
} jbig2dec_params_t;
@@ -59,18 +55,14 @@
static void
hash_init(jbig2dec_params_t *params)
{-#ifdef HAVE_OPENSSL_SHA1
- params->hash_ctx = malloc(sizeof(EVP_MD_CTX));
+ params->hash_ctx = malloc(sizeof(SHA1_CTX));
if (params->hash == NULL) {fprintf(stderr, "unable to allocate hash state\n");
params->hash = 0;
return;
} else {- // FIXME: is this call ever necessary?
- //OpenSSL_add_all_digests();
- EVP_DigestInit(params->hash_ctx, EVP_sha1());
+ SHA1_Init(params->hash_ctx);
}
-#endif /* HAVE_OPENSSL_SHA1 */
}
static void
@@ -77,37 +69,28 @@
hash_image(jbig2dec_params_t *params, Jbig2Image *image)
{unsigned int N = image->stride * image->height;
-#ifdef HAVE_OPENSSL_SHA1
- EVP_DigestUpdate(params->hash_ctx, image->data, N);
-#endif
+ SHA1_Update(params->hash_ctx, image->data, N);
}
static void
hash_print(jbig2dec_params_t *params, FILE *out)
{-#ifdef HAVE_OPENSSL_SHA1
- unsigned char md[EVP_MAX_MD_SIZE];
- char digest[2*EVP_MAX_MD_SIZE + 1];
+ unsigned char md[SHA1_DIGEST_SIZE];
+ char digest[2*SHA1_DIGEST_SIZE + 1];
int i, len;
- EVP_DigestFinal(params->hash_ctx, md, &len);
- for (i = 0; i < len; i++) {+ SHA1_Final(params->hash_ctx, md);
+ for (i = 0; i < SHA1_DIGEST_SIZE; i++) {snprintf(&(digest[2*i]), 3, "%02x", md[i]);
}
fprintf(out, "%s", digest);
-#else
- fprintf(out, "sorry, hash function unimplemented");
-#endif
}
static void
hash_free(jbig2dec_params_t *params)
{-#ifdef HAVE_OPENSSL_SHA1
- // FIXME: need to check for SHA1 finalization?
free(params->hash_ctx);
params->hash_ctx = NULL;
-#endif
}
--- /dev/null
+++ b/sha1.c
@@ -1,0 +1,385 @@
+/*
+SHA-1 in C
+By Steve Reid <sreid@sea-to-sky.net>
+100% Public Domain
+
+-----------------
+Modified 7/98
+By James H. Brown <jbrown@burgoyne.com>
+Still 100% Public Domain
+
+Corrected a problem which generated improper hash values on 16 bit machines
+Routine SHA1Update changed from
+ void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int
+len)
+to
+ void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned
+long len)
+
+The 'len' parameter was declared an int which works fine on 32 bit machines.
+However, on 16 bit machines an int is too small for the shifts being done
+against
+it. This caused the hash function to generate incorrect values if len was
+greater than 8191 (8K - 1) due to the 'len << 3' on line 3 of SHA1Update().
+
+Since the file IO in main() reads 16K at a time, any file 8K or larger would
+be guaranteed to generate the wrong hash (e.g. Test Vector #3, a million
+"a"s).
+
+I also changed the declaration of variables i & j in SHA1Update to
+unsigned long from unsigned int for the same reason.
+
+These changes should make no difference to any 32 bit implementations since
+an
+int and a long are the same size in those environments.
+
+--
+I also corrected a few compiler warnings generated by Borland C.
+1. Added #include <process.h> for exit() prototype
+2. Removed unused variable 'j' in SHA1Final
+3. Changed exit(0) to return(0) at end of main.
+
+ALL changes I made can be located by searching for comments containing 'JHB'
+-----------------
+Modified 8/98
+By Steve Reid <sreid@sea-to-sky.net>
+Still 100% public domain
+
+1- Removed #include <process.h> and used return() instead of exit()
+2- Fixed overwriting of finalcount in SHA1Final() (discovered by Chris Hall)
+3- Changed email address from steve@edmweb.com to sreid@sea-to-sky.net
+
+-----------------
+Modified 4/01
+By Saul Kravitz <Saul.Kravitz@celera.com>
+Still 100% PD
+Modified to run on Compaq Alpha hardware.
+
+-----------------
+Modified 07/2002
+By Ralph Giles <giles@artofcode.com>
+Still 100% public domain
+modified for use with stdint types, autoconf
+code cleanup, removed attribution comments
+switched SHA1Final() argument order for consistency
+use SHA1_ prefix for public api
+move public api to sha1.h
+*/
+
+/*
+Test Vectors (from FIPS PUB 180-1)
+"abc"
+ A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
+"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+ 84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
+A million repetitions of "a"
+ 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
+*/
+
+/* #define SHA1HANDSOFF */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#include "config_types.h"
+#elif defined(_WIN32)
+#include "config_win32.h"
+#endif
+
+#include <stdio.h>
+#include <string.h>
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#include "sha1.h"
+
+void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64]);
+
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+/* blk0() and blk() perform the initial expand. */
+/* I got the idea of expanding during the round function from SSLeay */
+#ifndef WORDS_BIGENDIAN
+#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
+ |(rol(block->l[i],8)&0x00FF00FF))
+#else
+#define blk0(i) block->l[i]
+#endif
+#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
+ ^block->l[(i+2)&15]^block->l[i&15],1))
+
+/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+
+
+#ifdef VERBOSE /* SAK */
+void SHAPrintContext(SHA1_CTX *context, char *msg){+ printf("%s (%d,%d) %x %x %x %x %x\n",+ msg,
+ context->count[0], context->count[1],
+ context->state[0],
+ context->state[1],
+ context->state[2],
+ context->state[3],
+ context->state[4]);
+}
+#endif /* VERBOSE */
+
+/* Hash a single 512-bit block. This is the core of the algorithm. */
+void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
+{+ uint32_t a, b, c, d, e;
+ typedef union {+ uint8_t c[64];
+ uint32_t l[16];
+ } CHAR64LONG16;
+ CHAR64LONG16* block;
+
+#ifdef SHA1HANDSOFF
+ static uint8_t workspace[64];
+ block = (CHAR64LONG16*)workspace;
+ memcpy(block, buffer, 64);
+#else
+ block = (CHAR64LONG16*)buffer;
+#endif
+
+ /* Copy context->state[] to working vars */
+ a = state[0];
+ b = state[1];
+ c = state[2];
+ d = state[3];
+ e = state[4];
+
+ /* 4 rounds of 20 operations each. Loop unrolled. */
+ R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+ R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+ R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+ R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+ R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+ R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+ R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+ R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+ R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+ R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+ R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+ R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+ R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+ R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+ R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+ R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+ R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+ R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+ R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+ R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+
+ /* Add the working vars back into context.state[] */
+ state[0] += a;
+ state[1] += b;
+ state[2] += c;
+ state[3] += d;
+ state[4] += e;
+
+ /* Wipe variables */
+ a = b = c = d = e = 0;
+}
+
+
+/* SHA1Init - Initialize new context */
+void SHA1_Init(SHA1_CTX* context)
+{+ /* SHA1 initialization constants */
+ context->state[0] = 0x67452301;
+ context->state[1] = 0xEFCDAB89;
+ context->state[2] = 0x98BADCFE;
+ context->state[3] = 0x10325476;
+ context->state[4] = 0xC3D2E1F0;
+ context->count[0] = context->count[1] = 0;
+}
+
+
+/* Run your data through this. */
+void SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len)
+{+ size_t i, j;
+
+#ifdef VERBOSE
+ SHAPrintContext(context, "before");
+#endif
+
+ j = (context->count[0] >> 3) & 63;
+ if ((context->count[0] += len << 3) < (len << 3)) context->count[1]++;
+ context->count[1] += (len >> 29);
+ if ((j + len) > 63) {+ memcpy(&context->buffer[j], data, (i = 64-j));
+ SHA1_Transform(context->state, context->buffer);
+ for ( ; i + 63 < len; i += 64) {+ SHA1_Transform(context->state, data + i);
+ }
+ j = 0;
+ }
+ else i = 0;
+ memcpy(&context->buffer[j], &data[i], len - i);
+
+#ifdef VERBOSE
+ SHAPrintContext(context, "after ");
+#endif
+}
+
+
+/* Add padding and return the message digest. */
+void SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE])
+{+ uint32_t i;
+ uint8_t finalcount[8];
+
+ for (i = 0; i < 8; i++) {+ finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
+ >> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */
+ }
+ SHA1_Update(context, (uint8_t *)"\200", 1);
+ while ((context->count[0] & 504) != 448) {+ SHA1_Update(context, (uint8_t *)"\0", 1);
+ }
+ SHA1_Update(context, finalcount, 8); /* Should cause a SHA1_Transform() */
+ for (i = 0; i < SHA1_DIGEST_SIZE; i++) {+ digest[i] = (uint8_t)
+ ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+ }
+
+ /* Wipe variables */
+ i = 0;
+ memset(context->buffer, 0, 64);
+ memset(context->state, 0, 20);
+ memset(context->count, 0, 8);
+ memset(finalcount, 0, 8); /* SWR */
+
+#ifdef SHA1HANDSOFF /* make SHA1Transform overwrite its own static vars */
+ SHA1_Transform(context->state, context->buffer);
+#endif
+}
+
+/*************************************************************/
+
+#if 0
+int main(int argc, char** argv)
+{+int i, j;
+SHA1_CTX context;
+unsigned char digest[SHA1_DIGEST_SIZE], buffer[16384];
+FILE* file;
+
+ if (argc > 2) {+ puts("Public domain SHA-1 implementation - by Steve Reid+<sreid@sea-to-sky.net>");
+ puts("Modified for 16 bit environments 7/98 - by James H. Brown+<jbrown@burgoyne.com>"); /* JHB */
+ puts("Produces the SHA-1 hash of a file, or stdin if no file is+specified.");
+ return(0);
+ }
+ if (argc < 2) {+ file = stdin;
+ }
+ else {+ if (!(file = fopen(argv[1], "rb"))) {+ fputs("Unable to open file.", stderr);+ return(-1);
+ }
+ }
+ SHA1_Init(&context);
+ while (!feof(file)) { /* note: what if ferror(file) */+ i = fread(buffer, 1, 16384, file);
+ SHA1_Update(&context, buffer, i);
+ }
+ SHA1_Final(&context, digest);
+ fclose(file);
+ for (i = 0; i < SHA1_DIGEST_SIZE/4; i++) {+ for (j = 0; j < 4; j++) {+ printf("%02X", digest[i*4+j]);+ }
+ putchar(' ');+ }
+ putchar('\n');+ return(0); /* JHB */
+}
+#endif
+
+/* self test */
+
+#ifdef TEST
+
+static unsigned char *test_data[] = {+ "abc",
+ "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+ "A million repetitions of 'a'"};
+static char *test_results[] = {+ "A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D",
+ "84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1",
+ "34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F"};
+
+
+void digest_to_hex(const uint8_t digest[SHA1_DIGEST_SIZE], char *output)
+{+ int i,j;
+ char *c = output;
+
+ for (i = 0; i < SHA1_DIGEST_SIZE/4; i++) {+ for (j = 0; j < 4; j++) {+ sprintf(c,"%02X", digest[i*4+j]);
+ c += 2;
+ }
+ sprintf(c, " ");
+ c += 1;
+ }
+ *(c - 1) = '\0';
+}
+
+int main(int argc, char** argv)
+{+ int i, j,k;
+ SHA1_CTX context;
+ uint8_t digest[20];
+ char output[80];
+ char *c;
+
+ fprintf(stdout, "verifying SHA-1 implementation...");
+
+ for (k = 0; k < 2; k++){ + SHA1_Init(&context);
+ SHA1_Update(&context, (uint8_t*)test_data[k], strlen(test_data[k]));
+ SHA1_Final(&context, digest);
+ digest_to_hex(digest, output);
+
+ if (strcmp(output, test_results[k])) {+ fprintf(stdout, "FAIL\n");
+ fprintf(stderr,"* hash of \"%s\" incorrect:\n", test_data[k]);
+ fprintf(stderr,"\t%s returned\n", output);
+ fprintf(stderr,"\t%s is correct\n", test_results[k]);
+ return (1);
+ }
+ }
+ /* million 'a' vector we feed separately */
+ SHA1_Init(&context);
+ for (k = 0; k < 1000000; k++)
+ SHA1_Update(&context, (uint8_t*)"a", 1);
+ SHA1_Final(&context, digest);
+ digest_to_hex(digest, output);
+ if (strcmp(output, test_results[2])) {+ fprintf(stdout, "FAIL\n");
+ fprintf(stderr,"* hash of \"%s\" incorrect:\n", test_data[2]);
+ fprintf(stderr,"\t%s returned\n", output);
+ fprintf(stderr,"\t%s is correct\n", test_results[2]);
+ return (1);
+ }
+
+ /* success */
+ fprintf(stdout, "ok\n");
+ return(0);
+}
+#endif /* TEST */
+
--- /dev/null
+++ b/sha1.h
@@ -1,0 +1,27 @@
+/* public api for steve reid's public domain SHA-1 implementation */
+/* this file is in the public domain */
+
+#ifndef __SHA1_H
+#define __SHA1_H
+
+#ifdef __cplusplus
+extern "C" {+#endif
+
+typedef struct {+ uint32_t state[5];
+ uint32_t count[2];
+ uint8_t buffer[64];
+} SHA1_CTX;
+
+#define SHA1_DIGEST_SIZE 20
+
+void SHA1_Init(SHA1_CTX* context);
+void SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len);
+void SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE]);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SHA1_H */
\ No newline at end of file