From: Simon Josefsson <simon@josefsson.org>
Date: Sun, 13 Apr 2008 12:54:36 +0000 (+0200)
Subject: Quick fix for SHA-224 and old libgcrypt's.
X-Git-Tag: gnutls_2_3_5~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ffcfb31d32c830a4e8968ff0fabb22ad01e9c15;p=thirdparty%2Fgnutls.git

Quick fix for SHA-224 and old libgcrypt's.
---

diff --git a/lgl/m4/gnulib-cache.m4 b/lgl/m4/gnulib-cache.m4
index ef382538ea..693b5b9b9d 100644
--- a/lgl/m4/gnulib-cache.m4
+++ b/lgl/m4/gnulib-cache.m4
@@ -18,7 +18,7 @@
 #   gnulib-tool --import --dir=. --lib=liblgnu --source-base=lgl --m4-base=lgl/m4 --doc-base=doc --aux-dir=build-aux --lgpl=2 --libtool --macro-prefix=lgl --no-vc-files crypto/gc crypto/gc-arcfour crypto/gc-arctwo crypto/gc-camellia crypto/gc-des crypto/gc-hmac-md5 crypto/gc-md2 crypto/gc-md4 crypto/gc-md5 crypto/gc-pbkdf2-sha1 crypto/gc-random crypto/gc-rijndael crypto/gc-sha1 func gettext memmem-simple memmove minmax read-file snprintf socklen stdint strverscmp sys_socket sys_stat time_r unistd vasprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
-gl_LOCAL_DIR([])
+gl_LOCAL_DIR([lgl/override])
 gl_MODULES([crypto/gc crypto/gc-arcfour crypto/gc-arctwo crypto/gc-camellia crypto/gc-des crypto/gc-hmac-md5 crypto/gc-md2 crypto/gc-md4 crypto/gc-md5 crypto/gc-pbkdf2-sha1 crypto/gc-random crypto/gc-rijndael crypto/gc-sha1 func gettext memmem-simple memmove minmax read-file snprintf socklen stdint strverscmp sys_socket sys_stat time_r unistd vasprintf])
 gl_AVOID([])
 gl_SOURCE_BASE([lgl])
diff --git a/lgl/override/lib/gc-libgcrypt.c.diff b/lgl/override/lib/gc-libgcrypt.c.diff
new file mode 100644
index 0000000000..d1bedb882f
--- /dev/null
+++ b/lgl/override/lib/gc-libgcrypt.c.diff
@@ -0,0 +1,26 @@
+--- lgl/gc-libgcrypt.c.orig	2008-04-13 14:51:05.000000000 +0200
++++ lgl/gc-libgcrypt.c	2008-04-13 14:52:04.000000000 +0200
+@@ -294,9 +294,11 @@
+       gcryalg = GCRY_MD_SHA512;
+       break;
+ 
++#ifdef ENABLE_CAMELLIA
+     case GC_SHA224:
+       gcryalg = GCRY_MD_SHA224;
+       break;
++#endif
+ 
+     case GC_RMD160:
+       gcryalg = GCRY_MD_RMD160;
+@@ -397,9 +399,11 @@
+       len = GC_SHA512_DIGEST_SIZE;
+       break;
+ 
++#ifdef ENABLE_CAMELLIA
+     case GC_SHA224:
+       len = GC_SHA224_DIGEST_SIZE;
+       break;
++#endif
+ 
+     default:
+       return 0;