diff options
| -rw-r--r-- | INSTALL | 9 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | ci/Dockerfile | 3 | ||||
| -rw-r--r-- | configure.ac | 4 |
4 files changed, 10 insertions, 7 deletions
@@ -10,9 +10,12 @@ The source for the file utility + library is available from ftp://ftp.astron.com/pub/file/ You will need a cryptographic library to support digests and signatures. -This library may be Mozilla NSS, OpenSSL or beecrypt. Which library to use -must be specified with the --with-crypto=[beecrypt|nss|openssl] argument -to configure. +This library may be libgcrypt, Mozilla NSS, OpenSSL or beecrypt. +Which library to use can be specified with the +--with-crypto=[libgcrypt|beecrypt|nss|openssl] argument to configure, +libgcrypt is the default. + +libgcrypt library is available from https://www.gnupg.org/software/libgcrypt/ If using the Mozilla NSS library for encyption (and NSPR library which NSS uses) it must be version 3.12 or later. Both NSPR and NSS libraries and diff --git a/Makefile.am b/Makefile.am index 79f860dde..e4bc838ce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,6 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-audit \ --with-selinux \ --with-imaevm \ - --with-crypto=openssl \ --disable-dependency-tracking include $(top_srcdir)/rpm.am diff --git a/ci/Dockerfile b/ci/Dockerfile index d1a45d434..c6c0caed3 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -25,6 +25,7 @@ RUN dnf -y install \ elfutils-libelf-devel \ elfutils-devel \ openssl-devel \ + libgcrypt-devel \ file-devel \ popt-devel \ libarchive-devel \ @@ -48,7 +49,7 @@ RUN dnf -y install \ && dnf clean all RUN autoreconf -vfi RUN ./configure \ - --with-crypto=openssl \ + --with-crypto=libgcrypt \ --with-selinux \ --with-cap \ --with-acl \ diff --git a/configure.ac b/configure.ac index 7bf53a927..91f3fb490 100644 --- a/configure.ac +++ b/configure.ac @@ -270,9 +270,9 @@ AM_CONDITIONAL(LIBDWARF,[test "$WITH_LIBDWARF" = yes]) # Select crypto library AC_ARG_WITH(crypto, [AC_HELP_STRING([--with-crypto=CRYPTO_LIB], - [The cryptographic library to use (nss|beecrypt|openssl|libgcrypt). The default is nss.]) + [The cryptographic library to use (nss|beecrypt|openssl|libgcrypt). The default is libgcrypt.]) ],[], - [with_crypto=nss]) + [with_crypto=libgcrypt]) # Refuse to proceed if someone specified --with-beecrypt (removed) AC_ARG_WITH(beecrypt, |