Commit Graph

64 Commits (66928b51c83c82cc40c122fd5ca8ebaabf252717)

Author SHA1 Message Date
Jeffrey Walton 7f958575ea Squashed commit of the following:
commit 47c75c6e9397e240919207e50e5a611d3e2a2428
Merge: d7685c2 42085ee
Author: Jeffrey Walton <noloader@gmail.com>
Date:   Thu Sep 8 20:20:39 2016 -0400

    Attempting to fix binary file merge conflict

commit d7685c2d946beecc419ddb6901c24e972c7cf3ee
Author: Jeffrey Walton <noloader@gmail.com>
Date:   Thu Sep 8 16:39:23 2016 -0400

    Add vsClean.cmd to vs2010.zip

commit 4b96fdf1c551260da60eb021f324bcc3fcfec626
Author: Jeffrey Walton <noloader@gmail.com>
Date:   Thu Sep 8 16:15:38 2016 -0400

    Add Keccak to vs2010.zip

commit 3962db73b7113ee805b46a5bb4da64e204fe6bb0
Author: Jeffrey Walton <noloader@gmail.com>
Date:   Thu Sep 8 15:40:35 2016 -0400

    Fold hmqv.cpp and fhmqv.cpp into mqv.cpp. There's no need for three empty source files

commit 44401448cbb6c8125b0f1ab4419c5b174408ffd7
Author: Jeffrey Walton <noloader@gmail.com>
Date:   Thu Sep 8 15:39:23 2016 -0400

    Fold hmqv.cpp and fhmqv.cpp into mqv.cpp. There's no need for three empty source files

commit 847bfccb8d5c388e67745dc8c69768fa503c5135
Author: Jeffrey Walton <noloader@gmail.com>
Date:   Thu Sep 8 14:48:02 2016 -0400

    Whitespace cleanup

commit 46a37be6fef361704dcf852bc9a099ce0a1da4c8
Merge: aefb8f8 3697867
Author: Jeffrey Walton <noloader@gmail.com>
Date:   Thu Sep 8 14:43:01 2016 -0400

    Merge 'master' into 'keccak'

commit aefb8f8ff2b81b967089c53b457a92fc6f7544d6
Merge: 51a828b 3c91d93
Author: Jeffrey Walton <noloader@gmail.com>
Date:   Thu Sep 8 12:39:51 2016 -0400

    Merge 'master' into 'keccak'

commit 51a828b88e37a4d18abb00300cd5522bd0e110c5
Merge: 4152870 e7c7722
Author: Jeffrey Walton <noloader@gmail.com>
Date:   Thu Sep 8 10:41:36 2016 -0400

    Merge 'master' into 'keccak'

commit 415287041e69ddadf5ca1f6fc794b87e145fc2db
Merge: 357a0c5 83ac849
Author: Jeffrey Walton <noloader@gmail.com>
Date:   Thu Sep 8 10:34:45 2016 -0400

    Merge 'master' into 'keccak'

commit 357a0c510f75e4e58078b500dd469462e90f7650
Author: Jeffrey Walton <noloader@gmail.com>
Date:   Thu Sep 8 10:13:32 2016 -0400

    Removed deprecated warning from SHA3 classes

commit 5cf9ec10d53b895b5a583e265e4e1298ed402195
Merge: 10ce0ed c2d60cc
Author: Jeffrey Walton <noloader@gmail.com>
Date:   Thu Sep 8 09:43:15 2016 -0400

    Merge 'master' into 'keccak'

commit 10ce0ed4c5b8a1ea230062fd2dfdec0d87ec5b42
Author: Jeffrey Walton <noloader@gmail.com>
Date:   Thu Sep 8 09:37:40 2016 -0400

    Add Keccak implementation based on early SHA3. Change SHA3 to NIST FIPS 202 conforming implementation
2016-09-08 20:24:25 -04:00
Jeffrey Walton e609559f06 Use "unsigned long" rather than "unsigned long long" for word64 when '_LP64 || __LP64__'
Guard use of the change on CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
2016-09-08 03:33:05 -04:00
Jeffrey Walton f0e7b45bcb Remove comma operator from return values for StaticGetDefaultRounds and StaticGetValidKeyLength in non-constexpr builds (Issue 255) 2016-09-07 09:32:06 -04:00
Jeffrey Walton 9205efda02 Add constexpr to CRYPTOPP_CONSTANT when CRYPTOPP_CXX11_CONSTEXPR is in effect 2016-09-06 08:53:55 -04:00
Jeffrey Walton a62aee441f Backed out use of "static const" to declare constant; switch to "enum" (Issue 255) 2016-09-06 04:04:03 -04:00
Jeffrey Walton f23314f731 Add configuration support for C++11 constexpr 2016-09-01 22:45:44 -04:00
Jeffrey Walton 3f6d499c19 Fix missing arm_acle.h under GCC 4.8. Rearrange some defines to better account for ARM and MIPS 2016-08-01 13:41:42 -04:00
Jeffrey Walton e2bf6824ff Fix cannot convert between 'word64*' and 'uint64_t*' and -fpermissive 2016-07-24 13:40:58 -04:00
Jeffrey Walton df47660605 Remove unneeded 'defined(__INTEL_COMPILER)' 2016-07-19 00:09:29 -04:00
Jeffrey Walton 686aef6028 Remove second definition of CRYPTOPP_ALIGN_DATA using alignas 2016-07-18 21:53:18 -04:00
Jeffrey Walton 5ad7bbd0c7 Guard CRYPTOPP_CXX11 for STLport
On Android, the compiler will define __cplusplus=201103L when using -std=c++11 even with STLport. STLport appears to be abandoned sometime around 2008.
2016-07-17 20:20:36 -04:00
Jeffrey Walton b0b7b71562 Aloow GCC to particpate in MACH-O initialization 2016-07-12 23:38:30 -04:00
Jeffrey Walton 5080a065ce Clear Valgrind findings under -Ofast 2016-07-12 23:05:00 -04:00
Jeffrey Walton ebef1f418b Disable automatic detection of CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE for SunCC. Remove #error for C++17 (Issue 222) 2016-07-12 11:05:05 -04:00
Jeffrey Walton 268b261739 Update comment for Sun Studio 12.4 2016-07-11 00:39:13 -04:00
Jeffrey Walton 53e2147d8d Fix compile under Sun Studio 12.3 and below with -xarch=aes defines 2016-07-10 20:40:45 -04:00
Jeffrey Walton 86445fb3e9 Fix integer.cpp compile when using config.recommend 2016-07-06 18:30:51 -04:00
Jeffrey Walton 6c0b120072 Go back to Commit 66ada4cc61 2016-07-06 14:39:18 -04:00
Mouse 87be783cd1 Revert "Merge remote-tracking branch 'upstream/master'" - not intended to be merged by me
This reverts commit 762c315566, reversing
changes made to b48866631a.
2016-07-06 12:01:28 -04:00
Mouse 7980738496 Revert "Fix config.recommend" - was not intended to be merged by me
This reverts commit 657bf41da0.
2016-07-06 11:59:07 -04:00
Mouse 657bf41da0 Fix config.recommend 2016-07-06 10:26:32 -04:00
Jeffrey Walton 34e95a7cde Add MacPorts GCC compiler and Clang integrated assembler support. This is a merge of the development branch 'clang-ia' 2016-07-05 02:49:33 -04:00
Jeffrey Walton 2d0dd95dda Fix "CRYPTOPP_USE_FIPS_202_SHA3 redfined" when using config.recommned with CRYPTOPP_USE_FIPS_202_SHA3 defined on command line 2016-07-04 17:51:09 -04:00
Jeffrey Walton ff8105404e Break build when we encounter Clang pretending to be VC++ (Issue 147) 2016-06-22 09:50:23 -04:00
Jeffrey Walton b1df5736a7 Merge 'solaris' dev branch into 'master' 2016-06-15 05:02:28 -04:00
Jeffrey Walton c1f025343a Add C++11 alignas support. Deleting 'alignas' branch 2016-06-14 19:14:09 -04:00
Jeffrey Walton 0414faff8e Revert "Add hack to pickup C++11 alignas"
This reverts commit 16df6e64a8. Detailed testing is revealing some fractures. The pain point seems to be C++11 is more strict about the location of the 'alignas(N)' in the statement-expression. Some compilers accept a looser grammar; while others do not.

Clang 3.3 is rejecting some of the statements with CRYPTOPP_ALIGN_DATA(N). Others may do the same, and we need to look at ICC in particular.
2016-06-07 15:22:11 -04:00
Jeffrey Walton 16df6e64a8 Add hack to pickup C++11 alignas 2016-06-06 23:57:46 -04:00
Jeffrey Walton e961c2da5b Merge Atomics branch into Master 2016-06-06 22:08:04 -04:00
Jeffrey Walton ec8c794a26 Removed duplicate C++11 atomics block. Fixed comment on CRYPTOPP_CXX11_ALIGNAS availability under MS toolchain 2016-05-30 17:46:00 -04:00
Jeffrey Walton 3a26c34721 Simplified tests ARM features. Tied ARM intrinsics to CRYPTOPP_DISABLE_ASM to allow easier user control and testing 2016-05-22 13:02:53 -04:00
Jeffrey Walton 733c78ba23 Relocate ARM defines to contribute to CRYPTOPP_BOOL_ALIGN16 2016-05-21 15:50:04 -04:00
Jeffrey Walton d7c832b813 Remove ILP32 from CRYPTOPP_L1_CACHE_LINE_SIZE. Clang defines it for all 32-bit data models, and not just X32 2016-05-20 16:38:42 -04:00
Jeffrey Walton 9534ce5bc5 Add ARM-64 defines for CRYPTOPP_L1_CACHE_LINE_SIZE 2016-05-20 16:28:55 -04:00
Jeffrey Walton 5e719b95bb Merge branch 'master' into windows-store 2016-05-16 20:38:02 -04:00
Jeffrey Walton f21c15d7af Fix iOS ARM CRC32 and Crypto detection 2016-05-16 20:37:22 -04:00
Jeffrey Walton b1a7ada564 Merge branch 'atomics' into windows-store 2016-05-16 18:49:05 -04:00
Jeffrey Walton e846beac35 Add defines for ARMv8 CRC32 and Crypto extensions 2016-05-16 18:47:31 -04:00
Jeffrey Walton 5414d0c957 Merge branch 'master' into atomics 2016-05-15 08:26:01 -04:00
Jeffrey Walton 480532931b Improve Apple iOS support for ARM and NEON. Add ARM Crypto detection 2016-05-15 08:24:51 -04:00
Jeffrey Walton 6ceeca80ce Merge branch 'master' into atomics 2016-05-15 05:59:58 -04:00
Jeffrey Walton 950cf4cdb9 Improve ARM feature detection for ARM64 2016-05-15 05:37:39 -04:00
Jeffrey Walton f6335bef7f Merge branch 'master' into atomics 2016-05-15 02:43:07 -04:00
Jeffrey Walton 01f77765d4 Add basic ARM and Windows Store support 2016-05-15 02:30:08 -04:00
Jeffrey Walton 8bb9197adc Add atomics support 2016-05-02 23:38:10 -04:00
Jeffrey Walton b499b8ba65 Fix Windows Phone compile (Issue 162) 2016-04-25 16:36:54 -04:00
Jeffrey Walton dfac7ec28b Fix Debian 8/GCC 4.9 compile on Core2 Duo 2016-04-25 01:43:45 -04:00
Jeffrey Walton d83e4a0704 Add comment on test vectors used for CRYPTOPP_USE_FIPS_202_SHA3 2016-04-24 00:03:21 -04:00
Jeffrey Walton 01d137155c Add SHA3/FIPS 202 test vectors. Add note to config.h on uncommenting sha3_fips_202.txt when defining CRYPTOPP_USE_FIPS_202_SHA3 2016-04-23 21:55:47 -04:00
Jeffrey Walton df1c94a38a Initial cut-in of CRYPTOPP_USE_FIPS_202_SHA3 macro 2016-04-23 18:47:23 -04:00