Commit 01420639 authored by Milan Broz's avatar Milan Broz

Move LUKS library to lib subdir.

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@366 36d66b0a-2a48-0410-832c-cd162a569da5
parent 312d8eca
EXTRA_DIST = FAQ
SUBDIRS = \
luks \
lib \
src \
man \
......
For 1.02
* Add LUKS key copy cmd: luksKeyCopy
* Add option to supply a master key directly. For LUKS commands: luksFormat, luksOpen and luksAddKey.
For 2.0
* LUKS header version bump:
* Add LUKS partition footer.
* change luks_write_phdr stuff.
* change luks_read_phdr stuff
* change hashing according to conversation with Sarah.
......@@ -184,9 +184,9 @@ dnl ==========================================================================
AC_CONFIG_FILES([ Makefile
lib/Makefile
lib/libcryptsetup.pc
lib/luks1/Makefile
src/Makefile
po/Makefile.in
luks/Makefile
man/Makefile
tests/Makefile
])
......
SUBDIRS = luks1
moduledir = $(libdir)/cryptsetup
pkgconfigdir = $(libdir)/pkgconfig
......@@ -5,7 +7,7 @@ pkgconfig_DATA = libcryptsetup.pc
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/luks \
-I$(top_srcdir)/lib/luks1 \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
-DPREFIX=\""$(prefix)"\" \
......@@ -29,7 +31,7 @@ libcryptsetup_la_LIBADD = \
@UUID_LIBS@ \
@DEVMAPPER_LIBS@ \
@LIBGCRYPT_LIBS@ \
../luks/libluks.la
luks1/libluks1.la
libcryptsetup_la_SOURCES = \
setup.c \
......
moduledir = $(libdir)/cryptsetup
noinst_LTLIBRARIES = libluks.la
noinst_LTLIBRARIES = libluks1.la
libluks_la_CFLAGS = -Wall @LIBGCRYPT_CFLAGS@
libluks1_la_CFLAGS = -Wall @LIBGCRYPT_CFLAGS@
libluks_la_SOURCES = \
libluks1_la_SOURCES = \
af.c \
pbkdf.c \
keymanage.c \
......
......@@ -26,7 +26,7 @@
#include <netinet/in.h>
#include <errno.h>
#include <gcrypt.h>
#include <../lib/internal.h>
#include "internal.h"
static void XORblock(char const *src1, char const *src2, char *dst, size_t n)
{
......
......@@ -33,9 +33,7 @@
#include <signal.h>
#include "luks.h"
//#include "../lib/libcryptsetup.h"
#include "../lib/internal.h"
//#include "../lib/blockdev.h"
#include "internal.h"
#define div_round_up(a,b) ({ \
typeof(a) __a = (a); \
......
......@@ -29,12 +29,12 @@
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <uuid/uuid.h>
#include "luks.h"
#include "af.h"
#include "pbkdf.h"
#include <uuid/uuid.h>
#include <../lib/internal.h>
#include "internal.h"
#define div_round_up(a,b) ({ \
typeof(a) __a = (a); \
......
......@@ -3,8 +3,6 @@
#include <stddef.h>
/* */
int PBKDF2_HMAC(const char *hash,
const char *password, size_t passwordLen,
const char *salt, size_t saltLen, unsigned int iterations,
......
......@@ -6,8 +6,8 @@ lib/setup.c
lib/utils.c
lib/utils_crypt.c
lib/utils_debug.c
luks/af.c
luks/keyencryption.c
luks/keymanage.c
luks/pbkdf.c
lib/luks1/af.c
lib/luks1/keyencryption.c
lib/luks1/keymanage.c
lib/luks1/pbkdf.c
src/cryptsetup.c
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment