diff options
| author | George McCollister <georgem@novatech-llc.com> | 2010-02-04 11:07:34 -0600 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-02-05 09:43:42 -0500 |
| commit | 63be61852bd7ad1f74569843fb90629d63adb591 (patch) | |
| tree | 04ef03c32be11507365d3c348cf28fb2d8ac3531 /server/Makefile.am | |
| parent | d61d37ed5c7cc51f1106fe3105c3cf226cc10277 (diff) | |
| download | sssd-63be61852bd7ad1f74569843fb90629d63adb591.tar.gz sssd-63be61852bd7ad1f74569843fb90629d63adb591.tar.xz sssd-63be61852bd7ad1f74569843fb90629d63adb591.zip | |
Added option to use libcrypto instead of NSS.
crypto_sha512crypt.c is a clone of nss_sha512crypt.c with the exception that
all usage of NSS and related libraries has been switched to libcrypto.
I renamed nss_sha512crypt.h to sha512crypt.h since it is common to both
crypto_sha512crypt.c and nss_sha512crypt.c. Note that the random number
generator is not seeded manually and thus relies on seeding done
automatically by libcrypto. On some systems without /dev/urandom
seeding may not be performed.
See http://www.openssl.org/docs/crypto/RAND_add.html.
Signed-off-by: George McCollister <georgem@novatech-llc.com>
Diffstat (limited to 'server/Makefile.am')
| -rw-r--r-- | server/Makefile.am | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index 0770a5ba0..7f8c24b47 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -103,12 +103,23 @@ endif noinst_LTLIBRARIES = \ libsss_crypt.la + +if HAVE_NSS + SSS_CRYPT_SOURCES = util/nss_sha512crypt.c + SSS_CRYPT_CFLAGS = $(NSS_CFLAGS) + SSS_CRYPT_LIBS = $(NSS_LIBS) +else + SSS_CRYPT_SOURCES = util/crypto_sha512crypt.c + SSS_CRYPT_CFLAGS = $(CRYPTO_CFLAGS) + SSS_CRYPT_LIBS = $(CRYPTO_LIBS) +endif + libsss_crypt_la_SOURCES = \ - util/nss_sha512crypt.c + $(SSS_CRYPT_SOURCES) libsss_crypt_la_CPPFLAGS = \ - $(NSS_CFLAGS) + $(SSS_CRYPT_CFLAGS) libsss_crypt_la_LIBADD = \ - $(NSS_LIBS) + $(SSS_CRYPT_LIBS) if BUILD_PYTHON_BINDINGS pyexec_LTLIBRARIES = \ @@ -254,8 +265,8 @@ SSSD_LIBS = \ $(COLLECTION_LIBS) \ $(DHASH_LIBS) \ $(REPLACE_LIBS) \ - libsss_crypt.la \ - $(NSS_LIBS) + $(SSS_CRYPT_LIBS) \ + libsss_crypt.la PYTHON_BINDINGS_LIBS = \ $(TALLOC_LIBS) \ @@ -265,7 +276,7 @@ PYTHON_BINDINGS_LIBS = \ $(DBUS_LIBS) \ $(REPLACE_LIBS) \ $(PCRE_LIBS) \ - $(NSS_LIBS) \ + $(SSS_CRYPT_LIBS) \ libsss_crypt.la TOOLS_LIBS = \ @@ -287,7 +298,7 @@ endif dist_noinst_HEADERS = \ monitor/monitor.h \ - util/nss_sha512crypt.h \ + util/sha512crypt.h \ util/dlinklist.h \ util/util.h \ util/strtonum.h \ |