From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 20 Aug 2009 13:35:32 +0000 (+0200)
Subject: Reduce stack usage and remove code.
X-Git-Tag: gnutls_2_9_4~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d56d25e4b2425a7a17eb8d5bd3b896198a8abc99;p=thirdparty%2Fgnutls.git

Reduce stack usage and remove code.
---

diff --git a/libextra/gl/gnulib.mk b/libextra/gl/gnulib.mk
index c20e84c116..5cca8e8274 100644
--- a/libextra/gl/gnulib.mk
+++ b/libextra/gl/gnulib.mk
@@ -9,7 +9,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libxgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --avoid=dummy --avoid=stdint --makefile-name=gnulib.mk --libtool --macro-prefix=xgl --no-vc-files crypto/hmac-md5 crypto/md5 extensions havelib lib-msvc-compat lib-symbol-versions
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override --lib=libxgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --avoid=dummy --avoid=stdint --makefile-name=gnulib.mk --libtool --macro-prefix=xgl --no-vc-files crypto/hmac-md5 crypto/md5 extensions havelib lib-msvc-compat lib-symbol-versions
 
 
 MOSTLYCLEANFILES += core *.stackdump
diff --git a/libextra/gl/m4/gnulib-cache.m4 b/libextra/gl/m4/gnulib-cache.m4
index 2d161fc4af..613ab92e77 100644
--- a/libextra/gl/m4/gnulib-cache.m4
+++ b/libextra/gl/m4/gnulib-cache.m4
@@ -15,10 +15,10 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libxgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --avoid=dummy --avoid=stdint --makefile-name=gnulib.mk --libtool --macro-prefix=xgl --no-vc-files crypto/hmac-md5 crypto/md5 extensions havelib lib-msvc-compat lib-symbol-versions
+#   gnulib-tool --import --dir=. --local-dir=gl/override --lib=libxgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --avoid=dummy --avoid=stdint --makefile-name=gnulib.mk --libtool --macro-prefix=xgl --no-vc-files crypto/hmac-md5 crypto/md5 extensions havelib lib-msvc-compat lib-symbol-versions
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
-gl_LOCAL_DIR([])
+gl_LOCAL_DIR([gl/override])
 gl_MODULES([
   crypto/hmac-md5
   crypto/md5
diff --git a/libextra/gl/md5.c b/libextra/gl/md5.c
index 2e03bb900a..07e7e927bc 100644
--- a/libextra/gl/md5.c
+++ b/libextra/gl/md5.c
@@ -129,6 +129,8 @@ md5_finish_ctx (struct md5_ctx *ctx, void *resbuf)
   return md5_read_ctx (ctx, resbuf);
 }
 
+#if 0 /* Not needed by GnuTLS, and it has a large stack frame. */
+
 /* Compute MD5 message digest for bytes read from STREAM.  The
    resulting message digest number will be written into the 16 bytes
    beginning at RESBLOCK.  */
@@ -194,6 +196,7 @@ process_partial_block:
   md5_finish_ctx (&ctx, resblock);
   return 0;
 }
+#endif
 
 /* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
    result is always in little endian byte order, so that a byte-wise
diff --git a/libextra/gl/override/lib/md5.c.diff b/libextra/gl/override/lib/md5.c.diff
new file mode 100644
index 0000000000..327b50e175
--- /dev/null
+++ b/libextra/gl/override/lib/md5.c.diff
@@ -0,0 +1,19 @@
+--- gl/md5.c.orig	2009-08-20 15:33:39.000000000 +0200
++++ gl/md5.c	2009-08-20 15:32:00.000000000 +0200
+@@ -129,6 +129,8 @@
+   return md5_read_ctx (ctx, resbuf);
+ }
+ 
++#if 0 /* Not needed by GnuTLS, and it has a large stack frame. */
++
+ /* Compute MD5 message digest for bytes read from STREAM.  The
+    resulting message digest number will be written into the 16 bytes
+    beginning at RESBLOCK.  */
+@@ -196,6 +194,7 @@
+   md5_finish_ctx (&ctx, resblock);
+   return 0;
+ }
++#endif
+ 
+ /* Compute MD5 message digest for LEN bytes beginning at BUFFER.  The
+    result is always in little endian byte order, so that a byte-wise