From c28ccd241312035dc64211fc34ce5c4e40fa127b Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Mon, 14 Jul 2014 19:25:54 -0400 Subject: [PATCH] Fix wacky types u_int32_t to uint32_t &c --- include/fc/crypto/romix.hpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/include/fc/crypto/romix.hpp b/include/fc/crypto/romix.hpp index e46398d..21c3bc0 100644 --- a/include/fc/crypto/romix.hpp +++ b/include/fc/crypto/romix.hpp @@ -43,6 +43,7 @@ //////////////////////////////////////////////////////////////////////////////// #pragma once +#include #include namespace fc { @@ -56,21 +57,21 @@ namespace fc { class romix { public: - romix(u_int32_t memReqts, u_int32_t numIter, std::string salt); + romix(uint32_t memReqts, uint32_t numIter, std::string salt); std::string deriveKey_OneIter(std::string const & password); std::string deriveKey(std::string const & password); private: - u_int32_t hashOutputBytes_; - u_int32_t kdfOutputBytes_; // size of final key data + uint32_t hashOutputBytes_; + uint32_t kdfOutputBytes_; // size of final key data - u_int32_t memoryReqtBytes_; - u_int32_t sequenceCount_; + uint32_t memoryReqtBytes_; + uint32_t sequenceCount_; std::string salt_; // prob not necessary amidst numIter, memReqts // but I guess it can't hurt - u_int32_t numIterations_; // We set the ROMIX params for a given memory + uint32_t numIterations_; // We set the ROMIX params for a given memory // req't. Then run it numIter times to meet // the computation-time req't };