Move bls stuff from crypto/ to bls/

This commit is contained in:
Alexander Block 2018-10-12 19:39:17 +02:00
parent 80fd096b07
commit 9c8e4ac76b
11 changed files with 11 additions and 11 deletions

View File

@ -314,8 +314,6 @@ crypto_libdash_crypto_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) $(PIC_FLAGS)
crypto_libdash_crypto_a_SOURCES = \ crypto_libdash_crypto_a_SOURCES = \
crypto/aes.cpp \ crypto/aes.cpp \
crypto/aes.h \ crypto/aes.h \
crypto/bls.cpp \
crypto/bls.h \
crypto/common.h \ crypto/common.h \
crypto/hmac_sha256.cpp \ crypto/hmac_sha256.cpp \
crypto/hmac_sha256.h \ crypto/hmac_sha256.h \
@ -364,6 +362,8 @@ libdash_consensus_a_SOURCES = \
amount.h \ amount.h \
arith_uint256.cpp \ arith_uint256.cpp \
arith_uint256.h \ arith_uint256.h \
bls/bls.cpp \
bls/bls.h \
consensus/merkle.cpp \ consensus/merkle.cpp \
consensus/merkle.h \ consensus/merkle.h \
consensus/params.h \ consensus/params.h \
@ -422,10 +422,10 @@ libdash_common_a_SOURCES = \
libdash_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) libdash_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
libdash_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libdash_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
libdash_util_a_SOURCES = \ libdash_util_a_SOURCES = \
crypto/bls_ies.cpp \ bls/bls_ies.cpp \
crypto/bls_ies.h \ bls/bls_ies.h \
crypto/bls_worker.cpp \ bls/bls_worker.cpp \
crypto/bls_worker.h \ bls/bls_worker.h \
support/lockedpool.cpp \ support/lockedpool.cpp \
chainparamsbase.cpp \ chainparamsbase.cpp \
clientversion.cpp \ clientversion.cpp \

View File

@ -8,7 +8,7 @@
#include "validation.h" #include "validation.h"
#include "util.h" #include "util.h"
#include "crypto/bls.h" #include "bls/bls.h"
void CleanupBLSTests(); void CleanupBLSTests();
void CleanupBLSDkgTests(); void CleanupBLSDkgTests();

View File

@ -4,7 +4,7 @@
#include "bench.h" #include "bench.h"
#include "random.h" #include "random.h"
#include "crypto/bls_worker.h" #include "bls/bls_worker.h"
#include "utiltime.h" #include "utiltime.h"
#include <iostream> #include <iostream>

View File

@ -4,7 +4,7 @@
#include "bench.h" #include "bench.h"
#include "random.h" #include "random.h"
#include "crypto/bls_worker.h" #include "bls/bls_worker.h"
extern CBLSWorker blsWorker; extern CBLSWorker blsWorker;

View File

@ -8,7 +8,7 @@
#include "random.h" #include "random.h"
#include "streams.h" #include "streams.h"
#include "aes.h" #include "crypto/aes.h"
template <typename Out> template <typename Out>
static bool EncryptBlob(const void* in, size_t inSize, Out& out, const void* symKey, const void* iv) static bool EncryptBlob(const void* in, size_t inSize, Out& out, const void* symKey, const void* iv)

View File

@ -72,7 +72,7 @@
#include <stdio.h> #include <stdio.h>
#include <memory> #include <memory>
#include "crypto/bls.h" #include "bls/bls.h"
#ifndef WIN32 #ifndef WIN32
#include <signal.h> #include <signal.h>