lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'upstream/develop' into develop

cl-refactor
Christoph Jentzsch 10 years ago
parent
34c8cf9fd2 2ed2d479c6
commit
f943027d06
10 changed files with 287 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      alethzero/DownloadView.cpp
  2. 4
      alethzero/MainWin.cpp
  3. 10
      libdevcore/RangeMask.h
  4. 18
      libethereum/DownloadMan.h
  5. 7
      libethereum/EthereumHost.cpp
  6. 2
      libethereum/EthereumPeer.cpp
  7. 2
      libethereum/State.cpp
  8. 10
      libwhisper/WhisperPeer.cpp
  9. 2
      third/MainWin.cpp
  10. 240
      windows/LibCryptoPP.vcxproj

4
alethzero/DownloadView.cpp
View File

@ -51,7 +51,7 @@ void DownloadView::paintEvent(QPaintEvent*)
QSizeF area(n, n);
QPointF pos(0, 0);
auto const& bg = m_man->blocksGot();
auto bg = m_man->blocksGot();
for (unsigned i = bg.all().first, ei = bg.all().second; i < ei; ++i)
{
@ -63,7 +63,7 @@ void DownloadView::paintEvent(QPaintEvent*)
unsigned h = 0;
m_man->foreachSub([&](DownloadSub const& sub)
{
if (sub.asked().contains(i))
if (sub.askedContains(i))
s = h;
h++;
});

4
alethzero/MainWin.cpp
View File

@ -25,7 +25,7 @@
#include <QtWidgets/QMessageBox>
#include <QtWidgets/QInputDialog>
#include <QtWebKitWidgets/QWebFrame>
#include <QWebSettings>
#include <QtWebKit/QWebSettings>
#include <QtGui/QClipboard>
#include <QtCore/QtCore>
#include <boost/algorithm/string.hpp>
@ -462,7 +462,7 @@ QString Main::lookup(QString const& _a) const
void Main::on_about_triggered()
{
QMessageBox::about(this, "About AlethZero PoC-" + QString(dev::Version).section('.', 1, 1), QString("AlethZero/v") + dev::Version + "/" DEV_QUOTED(ETH_BUILD_TYPE) "/" DEV_QUOTED(ETH_BUILD_PLATFORM) "\n" DEV_QUOTED(ETH_COMMIT_HASH) + (ETH_CLEAN_REPO ? "\nCLEAN" : "\n+ LOCAL CHANGES") + "\n\nBy Gav Wood, 2014.\nBased on a design by Vitalik Buterin.\n\nThanks to the various contributors including: Alex Leverington, Tim Hughes, caktux, Eric Lombrozo, Marko Simovic.");
QMessageBox::about(this, "About AlethZero PoC-" + QString(dev::Version).section('.', 1, 1), QString("AlethZero/v") + dev::Version + "/" DEV_QUOTED(ETH_BUILD_TYPE) "/" DEV_QUOTED(ETH_BUILD_PLATFORM) "\n" DEV_QUOTED(ETH_COMMIT_HASH) + (ETH_CLEAN_REPO ? "\nCLEAN" : "\n+ LOCAL CHANGES") + "\n\nBy Gav Wood, 2014.\nThis software wouldn't be where it is today without the many leaders & contributors including:\n\nVitalik Buterin, Tim Hughes, caktux, Nick Savers, Eric Lombrozo, Marko Simovic, the many testers and the Berlin \304\220\316\236V team.");
}
void Main::on_paranoia_triggered()

10
libdevcore/RangeMask.h
View File

@ -43,7 +43,7 @@ public:
using Range = std::pair<T, T>;
using Ranges = std::vector<Range>;
RangeMask() {}
RangeMask(): m_all(0, 0) {}
RangeMask(T _begin, T _end): m_all(_begin, _end) {}
RangeMask(Range const& _c): m_all(_c) {}
@ -150,7 +150,7 @@ public:
bool full() const
{
return m_ranges.size() == 1 && m_ranges.begin()->first == m_all.first && m_ranges.begin()->second == m_all.second;
return m_all.first == m_all.second || (m_ranges.size() == 1 && m_ranges.begin()->first == m_all.first && m_ranges.begin()->second == m_all.second);
}
void clear()
@ -158,6 +158,12 @@ public:
m_ranges.clear();
}
void reset()
{
m_ranges.clear();
m_all = std::make_pair(0, 0);
}
std::pair<T, T> const& all() const { return m_all; }
class const_iterator

18
libethereum/DownloadMan.h
View File

@ -54,6 +54,7 @@ public:
/// Nothing doing here.
void doneFetch() { resetFetch(); }
bool askedContains(unsigned _i) const { Guard l(m_fetch); return m_asked.contains(_i); }
RangeMask<unsigned> const& asked() const { return m_asked; }
RangeMask<unsigned> const& attemped() const { return m_attempted; }
@ -63,13 +64,13 @@ private:
Guard l(m_fetch);
m_remaining.clear();
m_indices.clear();
m_asked.clear();
m_attempted.clear();
m_asked.reset();
m_attempted.reset();
}
DownloadMan* m_man = nullptr;
Mutex m_fetch;
mutable Mutex m_fetch;
h256Set m_remaining;
std::map<h256, unsigned> m_indices;
RangeMask<unsigned> m_asked;
@ -94,6 +95,7 @@ public:
for (auto i: m_subs)
i->resetFetch();
}
WriteGuard l(m_lock);
m_chain.clear();
m_chain.reserve(_chain.size());
for (auto i = _chain.rbegin(); i != _chain.rend(); ++i)
@ -108,12 +110,14 @@ public:
for (auto i: m_subs)
i->resetFetch();
}
WriteGuard l(m_lock);
m_chain.clear();
m_blocksGot.clear();
m_blocksGot.reset();
}
RangeMask<unsigned> taken(bool _desperate = false) const
{
ReadGuard l(m_lock);
auto ret = m_blocksGot;
if (!_desperate)
{
@ -126,15 +130,17 @@ public:
bool isComplete() const
{
ReadGuard l(m_lock);
return m_blocksGot.full();
}
h256s chain() const { return m_chain; }
h256s chain() const { ReadGuard l(m_lock); return m_chain; }
void foreachSub(std::function<void(DownloadSub const&)> const& _f) const { ReadGuard l(x_subs); for(auto i: m_subs) _f(*i); }
unsigned subCount() const { ReadGuard l(x_subs); return m_subs.size(); }
RangeMask<unsigned> blocksGot() const { return m_blocksGot; }
RangeMask<unsigned> blocksGot() const { ReadGuard l(m_lock); return m_blocksGot; }
private:
mutable SharedMutex m_lock;
h256s m_chain;
RangeMask<unsigned> m_blocksGot;

7
libethereum/EthereumHost.cpp
View File

@ -74,13 +74,20 @@ void EthereumHost::noteHavePeerState(EthereumPeer* _who)
{
clog(NetAllDetail) << "Have peer state.";
// TODO: FIX: BUG: Better state management!
// if already downloading hash-chain, ignore.
if (m_grabbing != Grabbing::Nothing)
{
for (auto const& i: peers())
if (i->cap<EthereumPeer>()->m_grabbing == m_grabbing || m_grabbing == Grabbing::State)
{
clog(NetAllDetail) << "Already downloading chain. Just set to help out.";
_who->ensureGettingChain();
return;
}
m_grabbing = Grabbing::Nothing;
}
// otherwise check to see if we should be downloading...
_who->tryGrabbingHashChain();

2
libethereum/EthereumPeer.cpp
View File

@ -115,7 +115,7 @@ void EthereumPeer::tryGrabbingHashChain()
void EthereumPeer::giveUpOnFetch()
{
clogS(NetNote) << "GIVE UP FETCH";
clogS(NetNote) << "Finishing fetch...";
// a bit overkill given that the other nodes may yet have the needed blocks, but better to be safe than sorry.
if (m_grabbing == Grabbing::Chain || m_grabbing == Grabbing::ChainHelper)

2
libethereum/State.cpp
View File

@ -975,7 +975,7 @@ bool State::isTrieGood(bool _enforceRefs, bool _requireNoLeftOvers) const
RLP r(i.second);
TrieDB<h256, OverlayDB> storageDB(const_cast<OverlayDB*>(&m_db), r[2].toHash<h256>()); // promise not to alter OverlayDB.
for (auto const& j: storageDB) { (void)j; }
if (!e && r[3].toHash<h256>() != EmptySHA3 && m_db.lookup(r[3].toHash<h256>()).empty())
if (!e && r[3].toHash<h256>() && m_db.lookup(r[3].toHash<h256>()).empty())
return false;
}
}

10
libwhisper/WhisperPeer.cpp
View File

@ -92,15 +92,17 @@ void WhisperPeer::sendMessages()
n++;
}
// pause before sending if no messages to send
if (!n)
this_thread::sleep_for(chrono::milliseconds(100));
if (n)
{
RLPStream s;
prep(s);
s.appendList(n + 1) << MessagesPacket;
s.appendRaw(amalg.out(), n);
sealAndSend(s);
}
else
// just pause if no messages to send
this_thread::sleep_for(chrono::milliseconds(100));
}
void WhisperPeer::noteNewMessage(h256 _h, Message const& _m)

2
third/MainWin.cpp
View File

@ -347,7 +347,7 @@ QString Main::lookup(QString const& _a) const
void Main::on_about_triggered()
{
QMessageBox::about(this, "About Third PoC-" + QString(dev::Version).section('.', 1, 1), QString("Third/v") + dev::Version + "/" DEV_QUOTED(ETH_BUILD_TYPE) "/" DEV_QUOTED(ETH_BUILD_PLATFORM) "\n" DEV_QUOTED(ETH_COMMIT_HASH) + (ETH_CLEAN_REPO ? "\nCLEAN" : "\n+ LOCAL CHANGES") + "\n\nBy Gav Wood, 2014.\nBased on a design by Vitalik Buterin.\n\nThanks to the various contributors including: Alex Leverington, Tim Hughes, caktux, Eric Lombrozo, Marko Simovic.");
QMessageBox::about(this, "About Third PoC-" + QString(dev::Version).section('.', 1, 1), QString("Third/v") + dev::Version + "/" DEV_QUOTED(ETH_BUILD_TYPE) "/" DEV_QUOTED(ETH_BUILD_PLATFORM) "\n" DEV_QUOTED(ETH_COMMIT_HASH) + (ETH_CLEAN_REPO ? "\nCLEAN" : "\n+ LOCAL CHANGES") + "\n\nBy Gav Wood, 2014.\nThis software wouldn't be where it is today without the many leaders & contributors including:\n\nVitalik Buterin, Tim Hughes, caktux, Nick Savers, Eric Lombrozo, Marko Simovic, the many testers and the Berlin \304\220\316\236V team.");
}
void Main::writeSettings()

240
windows/LibCryptoPP.vcxproj
View File

@ -19,35 +19,275 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\cryptopp\adler32.cpp" />
<!--<ClCompile Include="..\..\cryptopp\algebra.cpp" />-->
<ClCompile Include="..\..\cryptopp\algparam.cpp" />
<ClCompile Include="..\..\cryptopp\arc4.cpp" />
<ClCompile Include="..\..\cryptopp\asn.cpp" />
<ClCompile Include="..\..\cryptopp\authenc.cpp" />
<ClCompile Include="..\..\cryptopp\base32.cpp" />
<ClCompile Include="..\..\cryptopp\base64.cpp" />
<ClCompile Include="..\..\cryptopp\basecode.cpp" />
<ClCompile Include="..\..\cryptopp\bench.cpp" />
<ClCompile Include="..\..\cryptopp\bench2.cpp" />
<ClCompile Include="..\..\cryptopp\bfinit.cpp" />
<ClCompile Include="..\..\cryptopp\blowfish.cpp" />
<ClCompile Include="..\..\cryptopp\blumshub.cpp" />
<ClCompile Include="..\..\cryptopp\camellia.cpp" />
<ClCompile Include="..\..\cryptopp\cast.cpp" />
<ClCompile Include="..\..\cryptopp\casts.cpp" />
<ClCompile Include="..\..\cryptopp\cbcmac.cpp" />
<ClCompile Include="..\..\cryptopp\ccm.cpp" />
<ClCompile Include="..\..\cryptopp\channels.cpp" />
<ClCompile Include="..\..\cryptopp\cmac.cpp" />
<ClCompile Include="..\..\cryptopp\cpu.cpp" />
<ClCompile Include="..\..\cryptopp\crc.cpp" />
<ClCompile Include="..\..\cryptopp\cryptlib.cpp" />
<ClCompile Include="..\..\cryptopp\cryptlib_bds.cpp" />
<ClCompile Include="..\..\cryptopp\datatest.cpp" />
<ClCompile Include="..\..\cryptopp\default.cpp" />
<ClCompile Include="..\..\cryptopp\des.cpp" />
<ClCompile Include="..\..\cryptopp\dessp.cpp" />
<ClCompile Include="..\..\cryptopp\dh.cpp" />
<ClCompile Include="..\..\cryptopp\dh2.cpp" />
<ClCompile Include="..\..\cryptopp\dll.cpp" />
<ClCompile Include="..\..\cryptopp\dlltest.cpp" />
<ClCompile Include="..\..\cryptopp\dsa.cpp" />
<ClCompile Include="..\..\cryptopp\eax.cpp" />
<ClCompile Include="..\..\cryptopp\ec2n.cpp" />
<!--<ClCompile Include="..\..\cryptopp\eccrypto.cpp" />-->
<ClCompile Include="..\..\cryptopp\ecp.cpp" />
<ClCompile Include="..\..\cryptopp\elgamal.cpp" />
<ClCompile Include="..\..\cryptopp\emsa2.cpp" />
<!--<ClCompile Include="..\..\cryptopp\eprecomp.cpp" />-->
<ClCompile Include="..\..\cryptopp\esign.cpp" />
<ClCompile Include="..\..\cryptopp\files.cpp" />
<ClCompile Include="..\..\cryptopp\filters.cpp" />
<ClCompile Include="..\..\cryptopp\fips140.cpp" />
<ClCompile Include="..\..\cryptopp\fipsalgt.cpp" />
<!--<ClCompile Include="..\..\cryptopp\fipstest.cpp" />-->
<ClCompile Include="..\..\cryptopp\gcm.cpp" />
<ClCompile Include="..\..\cryptopp\gf256.cpp" />
<ClCompile Include="..\..\cryptopp\gf2_32.cpp" />
<ClCompile Include="..\..\cryptopp\gf2n.cpp" />
<ClCompile Include="..\..\cryptopp\gfpcrypt.cpp" />
<ClCompile Include="..\..\cryptopp\gost.cpp" />
<ClCompile Include="..\..\cryptopp\gzip.cpp" />
<ClCompile Include="..\..\cryptopp\hex.cpp" />
<ClCompile Include="..\..\cryptopp\hmac.cpp" />
<ClCompile Include="..\..\cryptopp\hrtimer.cpp" />
<ClCompile Include="..\..\cryptopp\ida.cpp" />
<ClCompile Include="..\..\cryptopp\idea.cpp" />
<ClCompile Include="..\..\cryptopp\integer.cpp" />
<ClCompile Include="..\..\cryptopp\iterhash.cpp" />
<ClCompile Include="..\..\cryptopp\luc.cpp" />
<ClCompile Include="..\..\cryptopp\mars.cpp" />
<ClCompile Include="..\..\cryptopp\marss.cpp" />
<ClCompile Include="..\..\cryptopp\md2.cpp" />
<ClCompile Include="..\..\cryptopp\md4.cpp" />
<ClCompile Include="..\..\cryptopp\md5.cpp" />
<ClCompile Include="..\..\cryptopp\misc.cpp" />
<ClCompile Include="..\..\cryptopp\modes.cpp" />
<ClCompile Include="..\..\cryptopp\mqueue.cpp" />
<ClCompile Include="..\..\cryptopp\mqv.cpp" />
<ClCompile Include="..\..\cryptopp\nbtheory.cpp" />
<ClCompile Include="..\..\cryptopp\network.cpp" />
<ClCompile Include="..\..\cryptopp\oaep.cpp" />
<ClCompile Include="..\..\cryptopp\osrng.cpp" />
<ClCompile Include="..\..\cryptopp\panama.cpp" />
<ClCompile Include="..\..\cryptopp\pch.cpp" />
<ClCompile Include="..\..\cryptopp\pkcspad.cpp" />
<!--<ClCompile Include="..\..\cryptopp\polynomi.cpp" />-->
<ClCompile Include="..\..\cryptopp\pssr.cpp" />
<ClCompile Include="..\..\cryptopp\pubkey.cpp" />
<ClCompile Include="..\..\cryptopp\queue.cpp" />
<ClCompile Include="..\..\cryptopp\rabin.cpp" />
<ClCompile Include="..\..\cryptopp\randpool.cpp" />
<ClCompile Include="..\..\cryptopp\rc2.cpp" />
<ClCompile Include="..\..\cryptopp\rc5.cpp" />
<ClCompile Include="..\..\cryptopp\rc6.cpp" />
<ClCompile Include="..\..\cryptopp\rdtables.cpp" />
<ClCompile Include="..\..\cryptopp\regtest.cpp" />
<ClCompile Include="..\..\cryptopp\rijndael.cpp" />
<ClCompile Include="..\..\cryptopp\ripemd.cpp" />
<ClCompile Include="..\..\cryptopp\rng.cpp" />
<ClCompile Include="..\..\cryptopp\rsa.cpp" />
<ClCompile Include="..\..\cryptopp\rw.cpp" />
<ClCompile Include="..\..\cryptopp\safer.cpp" />
<ClCompile Include="..\..\cryptopp\salsa.cpp" />
<ClCompile Include="..\..\cryptopp\seal.cpp" />
<ClCompile Include="..\..\cryptopp\seed.cpp" />
<ClCompile Include="..\..\cryptopp\serpent.cpp" />
<ClCompile Include="..\..\cryptopp\sha.cpp" />
<ClCompile Include="..\..\cryptopp\sha3.cpp" />
<ClCompile Include="..\..\cryptopp\shacal2.cpp" />
<ClCompile Include="..\..\cryptopp\shark.cpp" />
<ClCompile Include="..\..\cryptopp\sharkbox.cpp" />
<!--<ClCompile Include="..\..\cryptopp\simple.cpp" />-->
<ClCompile Include="..\..\cryptopp\skipjack.cpp" />
<!--<ClCompile Include="..\..\cryptopp\socketft.cpp" />-->
<ClCompile Include="..\..\cryptopp\sosemanuk.cpp" />
<ClCompile Include="..\..\cryptopp\square.cpp" />
<ClCompile Include="..\..\cryptopp\squaretb.cpp" />
<!--<ClCompile Include="..\..\cryptopp\strciphr.cpp" />-->
<ClCompile Include="..\..\cryptopp\tea.cpp" />
<ClCompile Include="..\..\cryptopp\test.cpp" />
<ClCompile Include="..\..\cryptopp\tftables.cpp" />
<ClCompile Include="..\..\cryptopp\tiger.cpp" />
<ClCompile Include="..\..\cryptopp\tigertab.cpp" />
<ClCompile Include="..\..\cryptopp\trdlocal.cpp" />
<ClCompile Include="..\..\cryptopp\ttmac.cpp" />
<ClCompile Include="..\..\cryptopp\twofish.cpp" />
<ClCompile Include="..\..\cryptopp\validat1.cpp" />
<ClCompile Include="..\..\cryptopp\validat2.cpp" />
<ClCompile Include="..\..\cryptopp\validat3.cpp" />
<ClCompile Include="..\..\cryptopp\vmac.cpp" />
<ClCompile Include="..\..\cryptopp\wait.cpp" />
<ClCompile Include="..\..\cryptopp\wake.cpp" />
<ClCompile Include="..\..\cryptopp\whrlpool.cpp" />
<ClCompile Include="..\..\cryptopp\winpipes.cpp" />
<ClCompile Include="..\..\cryptopp\xtr.cpp" />
<ClCompile Include="..\..\cryptopp\xtrcrypt.cpp" />
<ClCompile Include="..\..\cryptopp\zdeflate.cpp" />
<ClCompile Include="..\..\cryptopp\zinflate.cpp" />
<ClCompile Include="..\..\cryptopp\zlib.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\cryptopp\3way.h" />
<ClInclude Include="..\..\cryptopp\adler32.h" />
<ClInclude Include="..\..\cryptopp\aes.h" />
<ClInclude Include="..\..\cryptopp\algebra.h" />
<ClInclude Include="..\..\cryptopp\algparam.h" />
<ClInclude Include="..\..\cryptopp\arc4.h" />
<ClInclude Include="..\..\cryptopp\argnames.h" />
<ClInclude Include="..\..\cryptopp\asn.h" />
<ClInclude Include="..\..\cryptopp\authenc.h" />
<ClInclude Include="..\..\cryptopp\base32.h" />
<ClInclude Include="..\..\cryptopp\base64.h" />
<ClInclude Include="..\..\cryptopp\basecode.h" />
<ClInclude Include="..\..\cryptopp\bench.h" />
<ClInclude Include="..\..\cryptopp\blowfish.h" />
<ClInclude Include="..\..\cryptopp\blumshub.h" />
<ClInclude Include="..\..\cryptopp\camellia.h" />
<ClInclude Include="..\..\cryptopp\cast.h" />
<ClInclude Include="..\..\cryptopp\cbcmac.h" />
<ClInclude Include="..\..\cryptopp\ccm.h" />
<ClInclude Include="..\..\cryptopp\channels.h" />
<ClInclude Include="..\..\cryptopp\cmac.h" />
<ClInclude Include="..\..\cryptopp\config.h" />
<ClInclude Include="..\..\cryptopp\cpu.h" />
<ClInclude Include="..\..\cryptopp\crc.h" />
<ClInclude Include="..\..\cryptopp\cryptlib.h" />
<ClInclude Include="..\..\cryptopp\default.h" />
<ClInclude Include="..\..\cryptopp\des.h" />
<ClInclude Include="..\..\cryptopp\dh.h" />
<ClInclude Include="..\..\cryptopp\dh2.h" />
<ClInclude Include="..\..\cryptopp\dll.h" />
<ClInclude Include="..\..\cryptopp\dmac.h" />
<ClInclude Include="..\..\cryptopp\dsa.h" />
<ClInclude Include="..\..\cryptopp\eax.h" />
<ClInclude Include="..\..\cryptopp\ec2n.h" />
<ClInclude Include="..\..\cryptopp\eccrypto.h" />
<ClInclude Include="..\..\cryptopp\ecp.h" />
<ClInclude Include="..\..\cryptopp\elgamal.h" />
<ClInclude Include="..\..\cryptopp\emsa2.h" />
<ClInclude Include="..\..\cryptopp\eprecomp.h" />
<ClInclude Include="..\..\cryptopp\esign.h" />
<ClInclude Include="..\..\cryptopp\factory.h" />
<ClInclude Include="..\..\cryptopp\files.h" />
<ClInclude Include="..\..\cryptopp\filters.h" />
<ClInclude Include="..\..\cryptopp\fips140.h" />
<ClInclude Include="..\..\cryptopp\fltrimpl.h" />
<ClInclude Include="..\..\cryptopp\gcm.h" />
<ClInclude Include="..\..\cryptopp\gf256.h" />
<ClInclude Include="..\..\cryptopp\gf2_32.h" />
<ClInclude Include="..\..\cryptopp\gf2n.h" />
<ClInclude Include="..\..\cryptopp\gfpcrypt.h" />
<ClInclude Include="..\..\cryptopp\gost.h" />
<ClInclude Include="..\..\cryptopp\gzip.h" />
<ClInclude Include="..\..\cryptopp\hex.h" />
<ClInclude Include="..\..\cryptopp\hmac.h" />
<ClInclude Include="..\..\cryptopp\hrtimer.h" />
<ClInclude Include="..\..\cryptopp\ida.h" />
<ClInclude Include="..\..\cryptopp\idea.h" />
<ClInclude Include="..\..\cryptopp\integer.h" />
<ClInclude Include="..\..\cryptopp\iterhash.h" />
<!--<ClInclude Include="..\..\cryptopp\lubyrack.h" />-->
<ClInclude Include="..\..\cryptopp\luc.h" />
<ClInclude Include="..\..\cryptopp\mars.h" />
<ClInclude Include="..\..\cryptopp\md2.h" />
<ClInclude Include="..\..\cryptopp\md4.h" />
<ClInclude Include="..\..\cryptopp\md5.h" />
<!--<ClInclude Include="..\..\cryptopp\mdc.h" />-->
<ClInclude Include="..\..\cryptopp\misc.h" />
<ClInclude Include="..\..\cryptopp\modarith.h" />
<ClInclude Include="..\..\cryptopp\modes.h" />
<ClInclude Include="..\..\cryptopp\modexppc.h" />
<ClInclude Include="..\..\cryptopp\mqueue.h" />
<ClInclude Include="..\..\cryptopp\mqv.h" />
<ClInclude Include="..\..\cryptopp\nbtheory.h" />
<ClInclude Include="..\..\cryptopp\network.h" />
<ClInclude Include="..\..\cryptopp\nr.h" />
<ClInclude Include="..\..\cryptopp\oaep.h" />
<ClInclude Include="..\..\cryptopp\oids.h" />
<ClInclude Include="..\..\cryptopp\osrng.h" />
<ClInclude Include="..\..\cryptopp\panama.h" />
<ClInclude Include="..\..\cryptopp\pch.h" />
<ClInclude Include="..\..\cryptopp\pkcspad.h" />
<ClInclude Include="..\..\cryptopp\polynomi.h" />
<ClInclude Include="..\..\cryptopp\pssr.h" />
<ClInclude Include="..\..\cryptopp\pubkey.h" />
<ClInclude Include="..\..\cryptopp\pwdbased.h" />
<ClInclude Include="..\..\cryptopp\queue.h" />
<ClInclude Include="..\..\cryptopp\rabin.h" />
<ClInclude Include="..\..\cryptopp\randpool.h" />
<ClInclude Include="..\..\cryptopp\rc2.h" />
<ClInclude Include="..\..\cryptopp\rc5.h" />
<ClInclude Include="..\..\cryptopp\rc6.h" />
<ClInclude Include="..\..\cryptopp\resource.h" />
<ClInclude Include="..\..\cryptopp\rijndael.h" />
<ClInclude Include="..\..\cryptopp\ripemd.h" />
<ClInclude Include="..\..\cryptopp\rng.h" />
<ClInclude Include="..\..\cryptopp\rsa.h" />
<ClInclude Include="..\..\cryptopp\rw.h" />
<ClInclude Include="..\..\cryptopp\safer.h" />
<ClInclude Include="..\..\cryptopp\salsa.h" />
<ClInclude Include="..\..\cryptopp\seal.h" />
<ClInclude Include="..\..\cryptopp\secblock.h" />
<ClInclude Include="..\..\cryptopp\seckey.h" />
<ClInclude Include="..\..\cryptopp\seed.h" />
<ClInclude Include="..\..\cryptopp\serpent.h" />
<!--<ClInclude Include="..\..\cryptopp\serpentp.h" />-->
<ClInclude Include="..\..\cryptopp\sha.h" />
<ClInclude Include="..\..\cryptopp\sha3.h" />
<ClInclude Include="..\..\cryptopp\shacal2.h" />
<ClInclude Include="..\..\cryptopp\shark.h" />
<ClInclude Include="..\..\cryptopp\simple.h" />
<ClInclude Include="..\..\cryptopp\skipjack.h" />
<ClInclude Include="..\..\cryptopp\smartptr.h" />
<ClInclude Include="..\..\cryptopp\socketft.h" />
<ClInclude Include="..\..\cryptopp\sosemanuk.h" />
<ClInclude Include="..\..\cryptopp\square.h" />
<ClInclude Include="..\..\cryptopp\stdcpp.h" />
<ClInclude Include="..\..\cryptopp\strciphr.h" />
<ClInclude Include="..\..\cryptopp\tea.h" />
<ClInclude Include="..\..\cryptopp\tiger.h" />
<ClInclude Include="..\..\cryptopp\trdlocal.h" />
<ClInclude Include="..\..\cryptopp\trunhash.h" />
<ClInclude Include="..\..\cryptopp\ttmac.h" />
<ClInclude Include="..\..\cryptopp\twofish.h" />
<ClInclude Include="..\..\cryptopp\validate.h" />
<ClInclude Include="..\..\cryptopp\vmac.h" />
<ClInclude Include="..\..\cryptopp\wait.h" />
<ClInclude Include="..\..\cryptopp\wake.h" />
<ClInclude Include="..\..\cryptopp\whrlpool.h" />
<ClInclude Include="..\..\cryptopp\winpipes.h" />
<ClInclude Include="..\..\cryptopp\words.h" />
<ClInclude Include="..\..\cryptopp\xtr.h" />
<ClInclude Include="..\..\cryptopp\xtrcrypt.h" />
<ClInclude Include="..\..\cryptopp\zdeflate.h" />
<ClInclude Include="..\..\cryptopp\zinflate.h" />
<ClInclude Include="..\..\cryptopp\zlib.h" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\cryptopp\x64dll.asm">

Write Preview
Loading…
Cancel
Save