Browse Source

Merge branch 'crypto' into cryptable

cl-refactor
subtly 10 years ago
parent
commit
f78c79b204
  1. 2
      libdevcrypto/Common.cpp
  2. 11
      libdevcrypto/EC.cpp

2
libdevcrypto/Common.cpp

@ -20,8 +20,8 @@
* @date 2014
*/
#include <random>
#include <mutex>
#include "EC.h"
#include "SHA3.h"
#include "FileSystem.h"

11
libdevcrypto/EC.cpp

@ -21,17 +21,6 @@
* ECDSA, ECIES
*/
#pragma warning(push)
#pragma warning(disable:4100 4244)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
#pragma GCC diagnostic ignored "-Wextra"
#include <files.h>
#pragma warning(pop)
#pragma GCC diagnostic pop
#include <secp256k1/secp256k1.h>
#include "CryptoPP.h"
#include "SHA3.h"

Loading…
Cancel
Save