Loading gatekeeperd/SoftGateKeeper.h +46 −1 Original line number Diff line number Diff line Loading @@ -20,6 +20,8 @@ extern "C" { #include <openssl/rand.h> #include <openssl/sha.h> #include <crypto_scrypt.h> } Loading @@ -30,6 +32,10 @@ extern "C" { namespace gatekeeper { struct fast_hash_t { uint64_t salt; uint8_t digest[SHA256_DIGEST_LENGTH]; }; class SoftGateKeeper : public GateKeeper { public: Loading Loading @@ -125,9 +131,48 @@ public: return true; } fast_hash_t ComputeFastHash(const SizedBuffer &password, uint64_t salt) { fast_hash_t fast_hash; size_t digest_size = password.length + sizeof(salt); std::unique_ptr<uint8_t[]> digest(new uint8_t[digest_size]); memcpy(digest.get(), &salt, sizeof(salt)); memcpy(digest.get() + sizeof(salt), password.buffer.get(), password.length); SHA256(digest.get(), digest_size, (uint8_t *) &fast_hash.digest); fast_hash.salt = salt; return fast_hash; } bool VerifyFast(const fast_hash_t &fast_hash, const SizedBuffer &password) { fast_hash_t computed = ComputeFastHash(password, fast_hash.salt); return memcmp(computed.digest, fast_hash.digest, SHA256_DIGEST_LENGTH) == 0; } bool DoVerify(const password_handle_t *expected_handle, const SizedBuffer &password) { FastHashMap::const_iterator it = fast_hash_map_.find(expected_handle->user_id); if (it != fast_hash_map_.end()) { return VerifyFast(it->second, password); } else { if (GateKeeper::DoVerify(expected_handle, password)) { uint64_t salt; GetRandom(&salt, sizeof(salt)); fast_hash_map_[expected_handle->user_id] = ComputeFastHash(password, salt); return true; } } return false; } private: typedef std::unordered_map<uint32_t, failure_record_t> FailureRecordMap; typedef std::unordered_map<uint64_t, fast_hash_t> FastHashMap; UniquePtr<uint8_t[]> key_; std::unordered_map<uint32_t, failure_record_t> failure_map_; FailureRecordMap failure_map_; FastHashMap fast_hash_map_; }; } Loading gatekeeperd/SoftGateKeeperDevice.h +1 −1 Original line number Diff line number Diff line Loading @@ -68,7 +68,7 @@ public: const uint8_t *provided_password, uint32_t provided_password_length, uint8_t **auth_token, uint32_t *auth_token_length, bool *request_reenroll); private: UniquePtr<GateKeeper> impl_; UniquePtr<SoftGateKeeper> impl_; }; } // namespace gatekeeper Loading Loading
gatekeeperd/SoftGateKeeper.h +46 −1 Original line number Diff line number Diff line Loading @@ -20,6 +20,8 @@ extern "C" { #include <openssl/rand.h> #include <openssl/sha.h> #include <crypto_scrypt.h> } Loading @@ -30,6 +32,10 @@ extern "C" { namespace gatekeeper { struct fast_hash_t { uint64_t salt; uint8_t digest[SHA256_DIGEST_LENGTH]; }; class SoftGateKeeper : public GateKeeper { public: Loading Loading @@ -125,9 +131,48 @@ public: return true; } fast_hash_t ComputeFastHash(const SizedBuffer &password, uint64_t salt) { fast_hash_t fast_hash; size_t digest_size = password.length + sizeof(salt); std::unique_ptr<uint8_t[]> digest(new uint8_t[digest_size]); memcpy(digest.get(), &salt, sizeof(salt)); memcpy(digest.get() + sizeof(salt), password.buffer.get(), password.length); SHA256(digest.get(), digest_size, (uint8_t *) &fast_hash.digest); fast_hash.salt = salt; return fast_hash; } bool VerifyFast(const fast_hash_t &fast_hash, const SizedBuffer &password) { fast_hash_t computed = ComputeFastHash(password, fast_hash.salt); return memcmp(computed.digest, fast_hash.digest, SHA256_DIGEST_LENGTH) == 0; } bool DoVerify(const password_handle_t *expected_handle, const SizedBuffer &password) { FastHashMap::const_iterator it = fast_hash_map_.find(expected_handle->user_id); if (it != fast_hash_map_.end()) { return VerifyFast(it->second, password); } else { if (GateKeeper::DoVerify(expected_handle, password)) { uint64_t salt; GetRandom(&salt, sizeof(salt)); fast_hash_map_[expected_handle->user_id] = ComputeFastHash(password, salt); return true; } } return false; } private: typedef std::unordered_map<uint32_t, failure_record_t> FailureRecordMap; typedef std::unordered_map<uint64_t, fast_hash_t> FastHashMap; UniquePtr<uint8_t[]> key_; std::unordered_map<uint32_t, failure_record_t> failure_map_; FailureRecordMap failure_map_; FastHashMap fast_hash_map_; }; } Loading
gatekeeperd/SoftGateKeeperDevice.h +1 −1 Original line number Diff line number Diff line Loading @@ -68,7 +68,7 @@ public: const uint8_t *provided_password, uint32_t provided_password_length, uint8_t **auth_token, uint32_t *auth_token_length, bool *request_reenroll); private: UniquePtr<GateKeeper> impl_; UniquePtr<SoftGateKeeper> impl_; }; } // namespace gatekeeper Loading