Commit Graph

2856 Commits (dfe5c1a9bcc78fea57ff599bfd4ea4d1e5ade983)

Author SHA1 Message Date
Jeffrey Walton dfe5c1a9bc
Suppress warnings C4231, C4355 and C4505 (Issue 412)
This should not cross-pollinate like when they were present in config.h
2017-08-02 23:19:09 -04:00
Jeffrey Walton 2fffd049e5
Update .appveyor recipe 2017-08-02 22:52:06 -04:00
Jeffrey Walton 5583c34b46
Update fork *.vcxproject files 2017-08-02 22:21:15 -04:00
Jeffrey Walton a5e4e14542
Fix "he syntax of the command is incorrect." 2017-08-02 22:12:30 -04:00
Jeffrey Walton 303870e45e Sync with Upstream master 2017-08-02 22:10:20 -04:00
Jeffrey Walton e162a67231
Copy converted *.vcxproj files from TestScripts before testing 2017-08-02 22:07:41 -04:00
Jeffrey Walton 77d2e4eaf5
Add AppVeyor rule to makefile
This should sidestep some problems we are experiencing with AppVeyor during x64 builds. Specifically, the missing VCUpgrade.exe and the poor job it does when upgrading our project for the platform\'s tools.
This recipe takes cryptlib.vcxproj and cryptest.vcxproj, and copies it into TestScripts. This ensures TestScripts always has the latest Visual Studio project files. Then, the recipe changes PlatformToolset to the undocumented $\(DefaultPlatformToolset\). Finally, our AppVeyor test script will copy TestScripts/*.vcxproj into PWD before executing MSbuild.
Also see http://stackoverflow.com/questions/43423761/cant-perform-64-bit-testing-under-appveyor, http://stackoverflow.com/questions/45452145/how-to-set-platformtoolset-property-from-msbuild and  http://stackoverflow.com/questions/43441273/how-to-run-vcupgrade-before-appveyor-build
2017-08-02 22:01:16 -04:00
Jeffrey Walton 90f385d10c
Merge local validat1.cpp 2017-08-02 20:55:42 -04:00
Jeffrey Walton 539931f931 Sync with Upstream master 2017-08-02 20:47:54 -04:00
Jeffrey Walton 76ff3fc03b
Remove pre-Crypto++ 5.5 interface
Users of OldRandomPool must use the new interface. All that means is they must call IncorporateEntropy instead of Put, and GenerateBlock instead of Get
2017-08-02 19:43:56 -04:00
Jeffrey Walton 89bae6e686 Sync with Upstream master 2017-08-02 18:58:23 -04:00
Jeffrey Walton 4da4ece5a5
Cut-in RandomNumberGenerator interface to OldRandPool
The existing interface still exists. The new interface is routed into the old methods. Without the new interface, using OldRandPool could result in:
    $ ./cryptest.exe v
    terminate called after throwing an instance of CryptoPP::NotImplemented
      what():  RandomNumberGenerator: IncorporateEntropy not implemented
    Aborted (core dumped)
2017-08-02 18:55:10 -04:00
Jeffrey Walton c870ad9d6f
Fix AppVeyor notifications 2017-08-02 17:31:31 -04:00
Jeffrey Walton f0866a0b20
Fix x64 builds
Take 8
2017-08-02 16:09:09 -04:00
Jeffrey Walton c3ddb325ec Sync with master 2017-08-02 05:47:28 -04:00
Jeffrey Walton 7b2bfd0eb8 Sync with Upstream master 2017-08-02 05:47:11 -04:00
Jeffrey Walton 2578bccf08
Reconfigure AppVeyor email notifications
Hopefully they will get through, soon
2017-08-02 05:42:24 -04:00
Jeffrey Walton 7a50d0a681 Merge branch 'master' of https://github.com/weidai11/cryptopp 2017-08-02 05:01:15 -04:00
Jeffrey Walton 49515c3a73
Whitespace check-in 2017-08-02 04:59:42 -04:00
Jeffrey Walton bc8b7db850 Merge branch 'master' of https://github.com/noloader/cryptopp 2017-08-02 04:55:02 -04:00
Jeffrey Walton 29cab73e8f Sync with Upstream master 2017-08-02 04:33:10 -04:00
Jeffrey Walton 820d62f978
Partially fix AppVeyor build
AppVeyor still has problems, like not being able to run a x64 test
2017-08-02 04:32:18 -04:00
Jeffrey Walton 946b04bb90
Fix x64 builds
Take 7
2017-08-02 04:26:53 -04:00
Jeffrey Walton 4264ff0f16
Fix x64 builds
Take 6
2017-08-02 04:25:46 -04:00
Jeffrey Walton be96ff3b0e
Fix x64 builds
Take 5
2017-08-02 04:23:54 -04:00
Jeffrey Walton f30ab0598e
Fix x64 builds
Take 4
2017-08-02 04:18:16 -04:00
Jeffrey Walton cceb07f768 Sync with Upstream master 2017-08-02 04:05:10 -04:00
Jeffrey Walton 6b200c80cf
Fix x64 builds
Take 3
2017-08-02 04:02:32 -04:00
Jeffrey Walton 91ea01ccfa
Back-out broken MSbuild changes 2017-08-02 01:29:11 -04:00
Jeffrey Walton 1608132146
Whitespace in AppVeyor script 2017-08-02 01:09:51 -04:00
Jeffrey Walton d611384fda
Attempt to set PlatformToolset from MSbuild command line
Also see http://stackoverflow.com/q/43423761/608639
2017-08-02 01:04:42 -04:00
Jeffrey Walton 09800e1774
Attempt to set PlatformToolset from MSbuild command line
Also see http://stackoverflow.com/q/43423761/608639
2017-08-02 01:02:43 -04:00
Jeffrey Walton 6fe35d4cc4 Sync with Upstream master 2017-08-02 00:20:51 -04:00
Jeffrey Walton b9e5cd2f90
Enable 64-bit builds under AppVeyor
Take 2
2017-08-02 00:19:59 -04:00
Jeffrey Walton 0e9a45ed97
Enable 64-bit builds under AppVeyor
Take 2
2017-08-02 00:08:29 -04:00
Jeffrey Walton da3932bc7e
Enable 64-bit builds under AppVeyor 2017-08-01 23:57:19 -04:00
Jeffrey Walton b69af2d6e8
Disable AppVeyor remote debugging 2017-08-01 23:29:08 -04:00
Jeffrey Walton 765e015406 Sync with Upstream master 2017-08-01 23:27:18 -04:00
Jeffrey Walton 9b9b9994c2
Increase minimum size for DefaultEncryptor test. Decrease minimum size fir Inflator tests 2017-08-01 23:23:51 -04:00
Jeffrey Walton d653ebe962
Enable AppVeyor debugging for investigate hang under Debug builds 2017-08-01 22:49:00 -04:00
Jeffrey Walton 0f3e83c211
Enable AppVeyor debugging for investigate hang under Debug builds 2017-08-01 22:39:22 -04:00
Jeffrey Walton 40ba36caf3 Sync with Upstream master 2017-08-01 20:46:49 -04:00
Jeffrey Walton 460d7e47dc Sync with Upstream master 2017-08-01 20:46:31 -04:00
Jeffrey Walton 6ab1a729ef
Cleared unused variable warnings 2017-08-01 20:42:55 -04:00
Jeffrey Walton 05bf4fd54b
Whitespace check-in 2017-08-01 19:58:08 -04:00
Jeffrey Walton ce6c578eb2 Sync with Upstream master 2017-08-01 19:12:26 -04:00
Jeffrey Walton 5fbbc5311c
Add self tests for OldRandomPool
We still need to get the test result cross-validated
2017-08-01 18:57:23 -04:00
Jeffrey Walton 02e3a79444
Add OldRandomPool class (Issue 452)
RandomPool used to be a PGP-style deterministic generator and folks used it as a key generation function. At Crypto++ 5.5 the design changed to harden it agianst rollback attacks. The design change resulted in an upgrade barrier. That is, some folks are stuck at Crypto++ 4.2 or Crypto++ 5.2 because they must interoperate with existing software.

Below is the test program we used for the test vector. It was run against Crypto++ 5.4.

    RandomPool prng;
    SecByteBlock seed(0x00, 384), result(64);
    prng.Put(seed, seed.size());

    prng.GenerateBlock(result, result.size());
    HexEncoder encoder(new FileSink(std::cout));

    std::cout << "RandomPool: ";
    encoder.Put(result, sizeof(result));
    std::cout << std::endl;
2017-08-01 18:53:31 -04:00
Jeffrey Walton 74ef70683d
Discard Clang error messages 2017-08-01 08:58:19 -04:00
Jeffrey Walton b9ab0579d3
Fix Clang compile 2017-08-01 05:55:06 -04:00