From 3b08dec5ee634f83ee18e1753d5ffe0ac5e3c458 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Thu, 29 Jul 2010 16:34:00 +0200
Subject: Move crypto functions into its own subdir

A refactoring patch that creates a common util/crypto subdir with
per-implementation subdirectories for each underlying crypto library
supported by SSSD.
---
 Makefile.am | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 4d8467c68..b0e04b5d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -117,11 +117,12 @@ noinst_LTLIBRARIES = \
     libsss_crypt.la
 
 if HAVE_NSS
-    SSS_CRYPT_SOURCES = src/util/nss_sha512crypt.c
+    SSS_CRYPT_SOURCES = src/util/crypto/nss/nss_sha512crypt.c \
+                        src/util/crypto/nss/nss_util.c
     SSS_CRYPT_CFLAGS = $(NSS_CFLAGS)
     SSS_CRYPT_LIBS = $(NSS_LIBS)
 else
-    SSS_CRYPT_SOURCES = src/util/crypto_sha512crypt.c
+    SSS_CRYPT_SOURCES = src/util/crypto/libcrypto/crypto_sha512crypt.c
     SSS_CRYPT_CFLAGS = $(CRYPTO_CFLAGS)
     SSS_CRYPT_LIBS = $(CRYPTO_LIBS)
 endif
@@ -296,7 +297,7 @@ endif
 
 dist_noinst_HEADERS = \
     src/monitor/monitor.h \
-    src/util/sha512crypt.h \
+    src/util/crypto/sss_crypto.h \
     src/util/dlinklist.h \
     src/util/util.h \
     src/util/strtonum.h \
@@ -350,6 +351,10 @@ dist_noinst_HEADERS = \
     src/resolv/ares/ares_data.h \
     src/tests/common.h
 
+if HAVE_NSS
+    dist_noinst_HEADERS += src/util/crypto/nss/nss_util.h
+endif
+
 
 ####################
 # Program Binaries #
-- 
cgit