diff --git a/stepmania/src/crypto51/files.cpp b/stepmania/src/crypto51/files.cpp index 2b42010ac8..c58c2c42e3 100644 --- a/stepmania/src/crypto51/files.cpp +++ b/stepmania/src/crypto51/files.cpp @@ -112,7 +112,7 @@ unsigned int FileStore::CopyRangeTo2(BufferedTransformation &target, unsigned lo return 0; // don't try to seek beyond the end of file } m_stream->seekg(newPosition); - unsigned long total = 0; + try { assert(!m_waiting); diff --git a/stepmania/src/crypto51/osrng.cpp b/stepmania/src/crypto51/osrng.cpp index 57f92e7709..0c7e8efa8f 100644 --- a/stepmania/src/crypto51/osrng.cpp +++ b/stepmania/src/crypto51/osrng.cpp @@ -87,7 +87,7 @@ void NonblockingRng::GenerateBlock(byte *output, unsigned int size) if (!CryptGenRandom(m_Provider.GetProviderHandle(), size, output)) throw OS_RNG_Err("CryptGenRandom"); #else - if (read(m_fd, output, size) != size) + if (read(m_fd, output, size) != int(size)) throw OS_RNG_Err("read /dev/urandom"); #endif } diff --git a/stepmania/src/crypto51/rsa.cpp b/stepmania/src/crypto51/rsa.cpp index 72dd0fea9f..37d31de567 100644 --- a/stepmania/src/crypto51/rsa.cpp +++ b/stepmania/src/crypto51/rsa.cpp @@ -9,7 +9,8 @@ #include "sha.h" #include "algparam.h" -#include "oaep.cpp" +//This isn't in the repository and doesn't seem to be used +//#include "oaep.cpp" NAMESPACE_BEGIN(CryptoPP) @@ -73,6 +74,7 @@ class RSAPrimeSelector : public PrimeSelector { public: RSAPrimeSelector(const Integer &e) : m_e(e) {} + virtual ~RSAPrimeSelector() { } bool IsAcceptable(const Integer &candidate) const {return RelativelyPrime(m_e, candidate-Integer::One());} Integer m_e; };