aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2003-02-11 14:49:16 +0000
committerDavid Shaw <[email protected]>2003-02-11 14:49:16 +0000
commitff8406b3d84c3104f3440e32d0e31f2900bd1ba2 (patch)
tree798e98482342bbeb492fd3dff4d22afdacc0b760
parent* Makefile.am: Use a local copy of libexecdir so it can be easily (diff)
downloadgnupg-ff8406b3d84c3104f3440e32d0e31f2900bd1ba2.tar.gz
gnupg-ff8406b3d84c3104f3440e32d0e31f2900bd1ba2.zip
* Makefile.am, md.c (load_digest_module): Only build in SHA384/512 if
specifically enabled.
-rw-r--r--cipher/ChangeLog5
-rw-r--r--cipher/Makefile.am7
-rw-r--r--cipher/md.c2
3 files changed, 10 insertions, 4 deletions
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index 41c5a86e9..b1308d357 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-11 David Shaw <[email protected]>
+
+ * Makefile.am, md.c (load_digest_module): Only build in SHA384/512
+ if specifically enabled.
+
2003-02-04 David Shaw <[email protected]>
* sha256.c, sha512.c: New.
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
index 4a228e0f6..024aaa97a 100644
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
@@ -52,13 +52,12 @@ libcipher_a_SOURCES = cipher.c \
md5.c \
rmd160.c \
sha1.c \
- sha256.c \
- sha512.c
+ sha256.c
EXTRA_libcipher_a_SOURCES = idea-stub.c tiger.c
-libcipher_a_DEPENDENCIES = @IDEA_O@ @TIGER_O@
-libcipher_a_LIBADD = @IDEA_O@ @TIGER_O@
+libcipher_a_DEPENDENCIES = @IDEA_O@ @TIGER_O@ @SHA512_O@
+libcipher_a_LIBADD = @IDEA_O@ @TIGER_O@ @SHA512_O@
tiger.o: $(srcdir)/tiger.c
`echo $(COMPILE) -c $(srcdir)/tiger.c | sed -e 's/-O[2-9s]*/-O1/g' `
diff --git a/cipher/md.c b/cipher/md.c
index 512f310fe..8a6b1d415 100644
--- a/cipher/md.c
+++ b/cipher/md.c
@@ -100,10 +100,12 @@ load_digest_module (void)
if (!new_list_item (DIGEST_ALGO_TIGER, tiger_get_info))
BUG();
#endif
+#ifdef USE_SHA512
if (!new_list_item (DIGEST_ALGO_SHA512, sha512_get_info))
BUG ();
if (!new_list_item (DIGEST_ALGO_SHA384, sha384_get_info))
BUG ();
+#endif
if (!new_list_item (DIGEST_ALGO_SHA256, sha256_get_info))
BUG ();
if (!new_list_item (DIGEST_ALGO_MD5, md5_get_info))