move digest to crypto/
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
fd552936d6
commit
4ac3a1f9e0
2
Makefile
2
Makefile
|
@ -410,7 +410,7 @@ scripts: scripts_basic include/config/auto.conf
|
||||||
$(Q)$(MAKE) $(build)=$(@)
|
$(Q)$(MAKE) $(build)=$(@)
|
||||||
|
|
||||||
# Objects we will link into barebox / subdirs we need to visit
|
# Objects we will link into barebox / subdirs we need to visit
|
||||||
common-y := common/ drivers/ commands/ lib/ net/ fs/
|
common-y := common/ drivers/ commands/ lib/ crypto/ net/ fs/
|
||||||
|
|
||||||
ifeq ($(dot-config),1)
|
ifeq ($(dot-config),1)
|
||||||
# Read in config
|
# Read in config
|
||||||
|
|
|
@ -144,3 +144,4 @@ source net/Kconfig
|
||||||
source drivers/Kconfig
|
source drivers/Kconfig
|
||||||
source fs/Kconfig
|
source fs/Kconfig
|
||||||
source lib/Kconfig
|
source lib/Kconfig
|
||||||
|
source crypto/Kconfig
|
||||||
|
|
|
@ -73,4 +73,4 @@ source net/Kconfig
|
||||||
source drivers/Kconfig
|
source drivers/Kconfig
|
||||||
source fs/Kconfig
|
source fs/Kconfig
|
||||||
source lib/Kconfig
|
source lib/Kconfig
|
||||||
|
source crypto/Kconfig
|
||||||
|
|
|
@ -225,3 +225,4 @@ source net/Kconfig
|
||||||
source drivers/Kconfig
|
source drivers/Kconfig
|
||||||
source fs/Kconfig
|
source fs/Kconfig
|
||||||
source lib/Kconfig
|
source lib/Kconfig
|
||||||
|
source crypto/Kconfig
|
||||||
|
|
|
@ -36,4 +36,4 @@ source net/Kconfig
|
||||||
source drivers/Kconfig
|
source drivers/Kconfig
|
||||||
source fs/Kconfig
|
source fs/Kconfig
|
||||||
source lib/Kconfig
|
source lib/Kconfig
|
||||||
|
source crypto/Kconfig
|
||||||
|
|
|
@ -55,3 +55,4 @@ source net/Kconfig
|
||||||
source drivers/Kconfig
|
source drivers/Kconfig
|
||||||
source fs/Kconfig
|
source fs/Kconfig
|
||||||
source lib/Kconfig
|
source lib/Kconfig
|
||||||
|
source crypto/Kconfig
|
||||||
|
|
|
@ -20,3 +20,4 @@ source net/Kconfig
|
||||||
source drivers/Kconfig
|
source drivers/Kconfig
|
||||||
source fs/Kconfig
|
source fs/Kconfig
|
||||||
source lib/Kconfig
|
source lib/Kconfig
|
||||||
|
source crypto/Kconfig
|
||||||
|
|
|
@ -65,3 +65,4 @@ source net/Kconfig
|
||||||
source drivers/Kconfig
|
source drivers/Kconfig
|
||||||
source fs/Kconfig
|
source fs/Kconfig
|
||||||
source lib/Kconfig
|
source lib/Kconfig
|
||||||
|
source crypto/Kconfig
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
config CRC32
|
||||||
|
bool
|
||||||
|
|
||||||
|
config CRC16
|
||||||
|
bool
|
||||||
|
|
||||||
|
menuconfig DIGEST
|
||||||
|
bool "Digest "
|
||||||
|
|
||||||
|
if DIGEST
|
||||||
|
|
||||||
|
config MD5
|
||||||
|
bool "MD5"
|
||||||
|
|
||||||
|
config SHA1
|
||||||
|
bool "SHA1"
|
||||||
|
|
||||||
|
config SHA256
|
||||||
|
bool "SHA256"
|
||||||
|
|
||||||
|
endif
|
|
@ -0,0 +1,5 @@
|
||||||
|
obj-$(CONFIG_CRC32) += crc32.o
|
||||||
|
obj-$(CONFIG_CRC16) += crc16.o
|
||||||
|
obj-$(CONFIG_MD5) += md5.o
|
||||||
|
obj-$(CONFIG_SHA1) += sha1.o
|
||||||
|
obj-$(CONFIG_SHA256) += sha256.o
|
22
lib/Kconfig
22
lib/Kconfig
|
@ -4,28 +4,6 @@ config ZLIB
|
||||||
config BZLIB
|
config BZLIB
|
||||||
bool
|
bool
|
||||||
|
|
||||||
config CRC32
|
|
||||||
bool
|
|
||||||
|
|
||||||
config CRC16
|
|
||||||
bool
|
|
||||||
|
|
||||||
menuconfig DIGEST
|
|
||||||
bool "Digest "
|
|
||||||
|
|
||||||
if DIGEST
|
|
||||||
|
|
||||||
config MD5
|
|
||||||
bool "MD5"
|
|
||||||
|
|
||||||
config SHA1
|
|
||||||
bool "SHA1"
|
|
||||||
|
|
||||||
config SHA256
|
|
||||||
bool "SHA256"
|
|
||||||
|
|
||||||
endif
|
|
||||||
|
|
||||||
config GENERIC_FIND_NEXT_BIT
|
config GENERIC_FIND_NEXT_BIT
|
||||||
def_bool n
|
def_bool n
|
||||||
|
|
||||||
|
|
|
@ -17,8 +17,6 @@ obj-y += recursive_action.o
|
||||||
obj-y += make_directory.o
|
obj-y += make_directory.o
|
||||||
obj-$(CONFIG_BZLIB) += bzlib.o bzlib_crctable.o bzlib_decompress.o bzlib_huffman.o bzlib_randtable.o
|
obj-$(CONFIG_BZLIB) += bzlib.o bzlib_crctable.o bzlib_decompress.o bzlib_huffman.o bzlib_randtable.o
|
||||||
obj-$(CONFIG_ZLIB) += zlib.o gunzip.o
|
obj-$(CONFIG_ZLIB) += zlib.o gunzip.o
|
||||||
obj-$(CONFIG_CRC32) += crc32.o
|
|
||||||
obj-$(CONFIG_CRC16) += crc16.o
|
|
||||||
obj-$(CONFIG_CMDLINE_EDITING) += readline.o
|
obj-$(CONFIG_CMDLINE_EDITING) += readline.o
|
||||||
obj-$(CONFIG_SIMPLE_READLINE) += readline_simple.o
|
obj-$(CONFIG_SIMPLE_READLINE) += readline_simple.o
|
||||||
obj-$(CONFIG_GLOB) += fnmatch.o
|
obj-$(CONFIG_GLOB) += fnmatch.o
|
||||||
|
@ -31,6 +29,3 @@ obj-y += lzo/
|
||||||
obj-y += show_progress.o
|
obj-y += show_progress.o
|
||||||
obj-$(CONFIG_LZO_DECOMPRESS) += decompress_unlzo.o
|
obj-$(CONFIG_LZO_DECOMPRESS) += decompress_unlzo.o
|
||||||
obj-$(CONFIG_PROCESS_ESCAPE_SEQUENCE) += process_escape_sequence.o
|
obj-$(CONFIG_PROCESS_ESCAPE_SEQUENCE) += process_escape_sequence.o
|
||||||
obj-$(CONFIG_MD5) += md5.o
|
|
||||||
obj-$(CONFIG_SHA1) += sha1.o
|
|
||||||
obj-$(CONFIG_SHA256) += sha256.o
|
|
||||||
|
|
|
@ -117,7 +117,7 @@ char *concat_subpath_file(const char *path, const char *f)
|
||||||
|
|
||||||
#include "../lib/recursive_action.c"
|
#include "../lib/recursive_action.c"
|
||||||
#include "../include/envfs.h"
|
#include "../include/envfs.h"
|
||||||
#include "../lib/crc32.c"
|
#include "../crypto/crc32.c"
|
||||||
#include "../lib/make_directory.c"
|
#include "../lib/make_directory.c"
|
||||||
#include "../include/environment.h"
|
#include "../include/environment.h"
|
||||||
#include "../common/environment.c"
|
#include "../common/environment.c"
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
char *cmdname;
|
char *cmdname;
|
||||||
|
|
||||||
#include "../include/zlib.h"
|
#include "../include/zlib.h"
|
||||||
#include "../lib/crc32.c"
|
#include "../crypto/crc32.c"
|
||||||
|
|
||||||
//extern unsigned long crc32 (unsigned long crc, const char *buf, unsigned int len);
|
//extern unsigned long crc32 (unsigned long crc, const char *buf, unsigned int len);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue