From a9fb0ecaabf5e5e6f587c1c36076d9e64e4a384c Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 17 Nov 2011 22:08:54 -0800 Subject: [PATCH] modules/crypto/gc-*: simplify dependencies and fix stdalign.h bug stdalign problem reported by Ian Beckwith in . * modules/crypto/gc-arcfour (Depends-on): Depend conditionally on crypto/arcfour. * modules/crypto/gc-arctwo (Depends-on): Depend conditionally on crypto/arctwo. * modules/crypto/gc-des (Depends-on): Depend conditionally on crypto/des. * modules/crypto/gc-hmac-md5 (Depends-on): Depend conditionally on crypto/hmac-md5. * modules/crypto/gc-hmac-sha1 (Depends-on): Depend conditionally on crypto/hmac-sha1. * modules/crypto/gc-md2 (Depends-on): Remove stdint, minmax. * modules/crypto/gc-md4 (Depends-on): Depend conditionally on crypto/md4. * modules/crypto/gc-md5 (Depends-on): Depend conditionally on crypto/md5. * modules/crypto/gc-rijndael (Depends-on): Depend conditionally on crypto/rijndael. * modules/crypto/gc-sha1 (Depends-on): Depend conditionally on crypto/sha1. * modules/crypto/gc-arcfour: * modules/crypto/gc-arctwo: * modules/crypto/gc-des: * modules/crypto/gc-hmac-md5: * modules/crypto/gc-hmac-sha1: * modules/crypto/gc-md2: * modules/crypto/gc-md4: * modules/crypto/gc-md5: * modules/crypto/gc-rijndael: * modules/crypto/gc-sha1: (Files, Depends-on, configure.ac): Remove now-unnecessary stuff, now that the conditional dependencies do the work for us. --- ChangeLog | 37 +++++++++++++++++++++++++++++++++++++ modules/crypto/gc-arcfour | 7 +------ modules/crypto/gc-arctwo | 9 +-------- modules/crypto/gc-des | 8 +------- modules/crypto/gc-hmac-md5 | 15 +-------------- modules/crypto/gc-hmac-sha1 | 15 +-------------- modules/crypto/gc-md2 | 2 -- modules/crypto/gc-md4 | 9 +-------- modules/crypto/gc-md5 | 9 +-------- modules/crypto/gc-rijndael | 10 +--------- modules/crypto/gc-sha1 | 9 +-------- 11 files changed, 46 insertions(+), 84 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f2bb5f68..68c90deb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,40 @@ +2011-11-17 Paul Eggert + + modules/crypto/gc-*: simplify dependencies and fix stdalign.h bug + stdalign problem reported by Ian Beckwith in + . + * modules/crypto/gc-arcfour (Depends-on): + Depend conditionally on crypto/arcfour. + * modules/crypto/gc-arctwo (Depends-on): + Depend conditionally on crypto/arctwo. + * modules/crypto/gc-des (Depends-on): + Depend conditionally on crypto/des. + * modules/crypto/gc-hmac-md5 (Depends-on): + Depend conditionally on crypto/hmac-md5. + * modules/crypto/gc-hmac-sha1 (Depends-on): + Depend conditionally on crypto/hmac-sha1. + * modules/crypto/gc-md2 (Depends-on): Remove stdint, minmax. + * modules/crypto/gc-md4 (Depends-on): + Depend conditionally on crypto/md4. + * modules/crypto/gc-md5 (Depends-on): + Depend conditionally on crypto/md5. + * modules/crypto/gc-rijndael (Depends-on): + Depend conditionally on crypto/rijndael. + * modules/crypto/gc-sha1 (Depends-on): + Depend conditionally on crypto/sha1. + * modules/crypto/gc-arcfour: + * modules/crypto/gc-arctwo: + * modules/crypto/gc-des: + * modules/crypto/gc-hmac-md5: + * modules/crypto/gc-hmac-sha1: + * modules/crypto/gc-md2: + * modules/crypto/gc-md4: + * modules/crypto/gc-md5: + * modules/crypto/gc-rijndael: + * modules/crypto/gc-sha1: + (Files, Depends-on, configure.ac): Remove now-unnecessary stuff, + now that the conditional dependencies do the work for us. + 2011-11-17 Jim Meyering tests: factor st_ctime-comparison out of two headers diff --git a/modules/crypto/gc-arcfour b/modules/crypto/gc-arcfour index 34a310c60..7df6b954e 100644 --- a/modules/crypto/gc-arcfour +++ b/modules/crypto/gc-arcfour @@ -3,18 +3,13 @@ Generic crypto wrappers for ARCFOUR stream cipher. Files: m4/gc-arcfour.m4 -lib/arcfour.h -lib/arcfour.c Depends-on: -stdint crypto/gc +crypto/arcfour [test "$ac_cv_libgcrypt" != yes] configure.ac: gl_GC_ARCFOUR -if test "$ac_cv_libgcrypt" != yes; then - AC_LIBOBJ([arcfour]) -fi gl_MODULE_INDICATOR([gc-arcfour]) Makefile.am: diff --git a/modules/crypto/gc-arctwo b/modules/crypto/gc-arctwo index 49006679f..bbd9ba910 100644 --- a/modules/crypto/gc-arctwo +++ b/modules/crypto/gc-arctwo @@ -3,20 +3,13 @@ Generic crypto wrappers for ARCTWO block cipher. Files: m4/gc-arctwo.m4 -lib/arctwo.h -lib/arctwo.c -m4/arctwo.m4 Depends-on: -stdint crypto/gc -bitrotate +crypto/arctwo [test "$ac_cv_libgcrypt" != yes] configure.ac: gl_GC_ARCTWO -if test "$ac_cv_libgcrypt" != yes; then - AC_LIBOBJ([arctwo]) -fi gl_MODULE_INDICATOR([gc-arctwo]) Makefile.am: diff --git a/modules/crypto/gc-des b/modules/crypto/gc-des index fd7cb764c..685899dc9 100644 --- a/modules/crypto/gc-des +++ b/modules/crypto/gc-des @@ -3,19 +3,13 @@ Generic crypto wrappers for DES block cipher. Files: m4/gc-des.m4 -lib/des.h -lib/des.c Depends-on: -stdint -stdbool crypto/gc +crypto/des [test "$ac_cv_libgcrypt" != yes] configure.ac: gl_GC_DES -if test "$ac_cv_libgcrypt" != yes; then - AC_LIBOBJ([des]) -fi gl_MODULE_INDICATOR([gc-des]) Makefile.am: diff --git a/modules/crypto/gc-hmac-md5 b/modules/crypto/gc-hmac-md5 index cd1973eeb..109ec5e0f 100644 --- a/modules/crypto/gc-hmac-md5 +++ b/modules/crypto/gc-hmac-md5 @@ -3,26 +3,13 @@ Generic crypto wrappers for HMAC-MD5 functions. Files: m4/gc-hmac-md5.m4 -lib/md5.h -lib/md5.c -m4/md5.m4 -lib/hmac.h -lib/hmac-md5.c -lib/memxor.h -lib/memxor.c -m4/memxor.m4 Depends-on: -stdint crypto/gc +crypto/hmac-md5 [test "$ac_cv_libgcrypt" != yes] configure.ac: gl_GC_HMAC_MD5 -if test "$ac_cv_libgcrypt" != yes; then - AC_LIBOBJ([md5]) - AC_LIBOBJ([hmac-md5]) - AC_LIBOBJ([memxor]) -fi gl_MODULE_INDICATOR([gc-hmac-md5]) Makefile.am: diff --git a/modules/crypto/gc-hmac-sha1 b/modules/crypto/gc-hmac-sha1 index c73351bb1..6235125bb 100644 --- a/modules/crypto/gc-hmac-sha1 +++ b/modules/crypto/gc-hmac-sha1 @@ -3,26 +3,13 @@ Generic crypto wrappers for HMAC-SHA1 functions. Files: m4/gc-hmac-sha1.m4 -lib/sha1.h -lib/sha1.c -m4/sha1.m4 -lib/hmac.h -lib/hmac-sha1.c -lib/memxor.h -lib/memxor.c -m4/memxor.m4 Depends-on: -stdint crypto/gc +crypto/hmac-sha1 [test "$ac_cv_libgcrypt" != yes] configure.ac: gl_GC_HMAC_SHA1 -if test "$ac_cv_libgcrypt" != yes; then - AC_LIBOBJ([sha1]) - AC_LIBOBJ([hmac-sha1]) - AC_LIBOBJ([memxor]) -fi gl_MODULE_INDICATOR([gc-hmac-sha1]) Makefile.am: diff --git a/modules/crypto/gc-md2 b/modules/crypto/gc-md2 index 124054924..5e5beaad1 100644 --- a/modules/crypto/gc-md2 +++ b/modules/crypto/gc-md2 @@ -5,8 +5,6 @@ Files: m4/gc-md2.m4 Depends-on: -stdint -minmax crypto/gc crypto/md2 diff --git a/modules/crypto/gc-md4 b/modules/crypto/gc-md4 index e527db589..e46589b09 100644 --- a/modules/crypto/gc-md4 +++ b/modules/crypto/gc-md4 @@ -3,20 +3,13 @@ Generic crypto wrappers for MD4 functions. Files: m4/gc-md4.m4 -lib/md4.h -lib/md4.c -m4/md4.m4 Depends-on: -stdalign -stdint crypto/gc +crypto/md4 [test "$ac_cv_libgcrypt" != yes] configure.ac: gl_GC_MD4 -if test "$ac_cv_libgcrypt" != yes; then - AC_LIBOBJ([md4]) -fi gl_MODULE_INDICATOR([gc-md4]) Makefile.am: diff --git a/modules/crypto/gc-md5 b/modules/crypto/gc-md5 index efa1c1832..0d6b272d2 100644 --- a/modules/crypto/gc-md5 +++ b/modules/crypto/gc-md5 @@ -3,20 +3,13 @@ Generic crypto wrappers for MD5 functions. Files: m4/gc-md5.m4 -lib/md5.h -lib/md5.c -m4/md5.m4 Depends-on: -stdalign -stdint crypto/gc +crypto/md5 [test "$ac_cv_libgcrypt" != yes] configure.ac: gl_GC_MD5 -if test "$ac_cv_libgcrypt" != yes; then - AC_LIBOBJ([md5]) -fi gl_MODULE_INDICATOR([gc-md5]) Makefile.am: diff --git a/modules/crypto/gc-rijndael b/modules/crypto/gc-rijndael index e01e12d33..249f47d0b 100644 --- a/modules/crypto/gc-rijndael +++ b/modules/crypto/gc-rijndael @@ -3,21 +3,13 @@ Generic crypto wrappers for rijndael block cipher. Files: m4/gc-rijndael.m4 -lib/rijndael-alg-fst.c -lib/rijndael-alg-fst.h -lib/rijndael-api-fst.c -lib/rijndael-api-fst.h Depends-on: -stdint crypto/gc +crypto/rijndael [test "$ac_cv_libgcrypt" != yes] configure.ac: gl_GC_RIJNDAEL -if test "$ac_cv_libgcrypt" != yes; then - AC_LIBOBJ([rijndael-alg-fst]) - AC_LIBOBJ([rijndael-api-fst]) -fi gl_MODULE_INDICATOR([gc-rijndael]) Makefile.am: diff --git a/modules/crypto/gc-sha1 b/modules/crypto/gc-sha1 index 4ee0a221f..f95900558 100644 --- a/modules/crypto/gc-sha1 +++ b/modules/crypto/gc-sha1 @@ -3,20 +3,13 @@ Generic crypto wrappers for SHA-1 functions. Files: m4/gc-sha1.m4 -lib/sha1.h -lib/sha1.c -m4/sha1.m4 Depends-on: -stdalign -stdint crypto/gc +crypto/sha1 [test "$ac_cv_libgcrypt" != yes] configure.ac: gl_GC_SHA1 -if test "$ac_cv_libgcrypt" != yes; then - AC_LIBOBJ([sha1]) -fi gl_MODULE_INDICATOR([gc-sha1]) Makefile.am: -- 2.11.0