Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make config.h more Autoconf friendly (GH #835) #836

Merged
merged 23 commits into from
May 17, 2019
Merged

Make config.h more Autoconf friendly (GH #835) #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
bc93768
Break out config.h into components
noloader May 16, 2019
376872b
Fix compile on OS X due to std::uncaught_exception define
noloader May 16, 2019
2308ca2
Fix compile due to typo
noloader May 16, 2019
432580c
Use config_ver.h in Makefiles
noloader May 17, 2019
6925220
Update comments
noloader May 17, 2019
083461a
Update comments
noloader May 17, 2019
b979a94
Update comments
noloader May 17, 2019
0418daf
Merge branch 'master' of https://github.com/weidai11/cryptopp
noloader May 17, 2019
d8b990a
Update comments
noloader May 17, 2019
b340554
Update comments
noloader May 17, 2019
2f82dde
Update comments
noloader May 17, 2019
91a65d2
Clear Clang warning for alignment requirements
noloader May 17, 2019
d6f5110
Clear Clang warning for alignment requirements
noloader May 17, 2019
c22eb40
Clear unused variable warning
noloader May 17, 2019
732f737
Clear unused variable warning
noloader May 17, 2019
686966d
Clear unused variable warning
noloader May 17, 2019
88c0789
Clear unused variable warning
noloader May 17, 2019
d112d4d
Clear GCC unknown pragma warning
noloader May 17, 2019
fc13431
Clear GCC unknown pragma warning
noloader May 17, 2019
e57aad7
Use config_asm.h
noloader May 17, 2019
d00fa82
Move endian settings to config_misc.h
noloader May 17, 2019
49161e8
Update comments
noloader May 17, 2019
82e6ca3
Update header guard
noloader May 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Filelist.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,16 @@ channels.h
cmac.cpp
cmac.h
config.h
config_align.h
config_asm.h
config_cpu.h
config_cxx.h
config_dll.h
config_int.h
config_misc.h
config_ns.h
config_os.h
config_ver.h
cpu.cpp
cpu.h
crc.cpp
Expand Down
2 changes: 1 addition & 1 deletion GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,7 @@ ifeq ($(findstring lean,$(MAKECMDGOALS)),lean)
endif # Dead code stripping

# For Shared Objects, Diff, Dist/Zip rules
LIB_VER := $(shell $(GREP) "define CRYPTOPP_VERSION" config.h | cut -d" " -f 3)
LIB_VER := $(shell $(GREP) "define CRYPTOPP_VERSION" config_ver.h | cut -d" " -f 3)
LIB_MAJOR := $(shell echo $(LIB_VER) | cut -c 1)
LIB_MINOR := $(shell echo $(LIB_VER) | cut -c 2)
LIB_PATCH := $(shell echo $(LIB_VER) | cut -c 3)
Expand Down
2 changes: 1 addition & 1 deletion GNUmakefile-cross
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ TESTOBJS := $(TESTSRCS:.cpp=.o)
LIBOBJS := $(filter-out $(TESTOBJS),$(OBJS))

# For Shared Objects, Diff, Dist/Zip rules
LIB_VER := $(shell $(EGREP) "define CRYPTOPP_VERSION" config.h | cut -d" " -f 3)
LIB_VER := $(shell $(EGREP) "define CRYPTOPP_VERSION" config_ver.h | cut -d" " -f 3)
LIB_MAJOR := $(shell echo $(LIB_VER) | cut -c 1)
LIB_MINOR := $(shell echo $(LIB_VER) | cut -c 2)
LIB_PATCH := $(shell echo $(LIB_VER) | cut -c 3)
Expand Down
6 changes: 0 additions & 6 deletions adv_simd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,9 +355,7 @@ inline size_t AdvancedProcessBlocks128_6x1_NEON(F1 func1, F6 func6,
CRYPTOPP_ASSERT(length >= 16);

const unsigned int w_one[] = {0, 0<<24, 0, 1<<24};
const unsigned int w_two[] = {0, 2<<24, 0, 2<<24};
const uint32x4_t s_one = vld1q_u32(w_one);
const uint32x4_t s_two = vld1q_u32(w_two);

const size_t blockSize = 16;
// const size_t neonBlockSize = 16;
Expand Down Expand Up @@ -511,9 +509,7 @@ inline size_t AdvancedProcessBlocks128_4x1_NEON(F1 func1, F4 func4,
CRYPTOPP_ASSERT(length >= 16);

const unsigned int w_one[] = {0, 0<<24, 0, 1<<24};
const unsigned int w_two[] = {0, 2<<24, 0, 2<<24};
const uint32x4_t s_one = vld1q_u32(w_one);
const uint32x4_t s_two = vld1q_u32(w_two);

const size_t blockSize = 16;
// const size_t neonBlockSize = 16;
Expand Down Expand Up @@ -647,9 +643,7 @@ inline size_t AdvancedProcessBlocks128_6x2_NEON(F2 func2, F6 func6,
CRYPTOPP_ASSERT(length >= 16);

const unsigned int w_one[] = {0, 0<<24, 0, 1<<24};
const unsigned int w_two[] = {0, 2<<24, 0, 2<<24};
const uint32x4_t s_one = vld1q_u32(w_one);
const uint32x4_t s_two = vld1q_u32(w_two);

const size_t blockSize = 16;
// const size_t neonBlockSize = 16;
Expand Down
4 changes: 3 additions & 1 deletion algparam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,10 +320,12 @@ class CRYPTOPP_DLL AlgorithmParametersBase
if (m_throwIfNotUsed && !m_used)
throw ParameterNotUsed(m_name);
}
#if !defined(CRYPTOPP_CXX17_EXCEPTIONS) && !defined(CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE)
#if !defined(CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE)
# if !defined(CRYPTOPP_CXX17_EXCEPTIONS)
catch(const Exception&)
{
}
# endif
#endif
}

Expand Down
Loading