RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 11:57:35 +00:00
Code Issues Activity Actions

LibCrypto: Avoid unaligned reads in GHash constructor

Browse source 
The fact that this always reads 16 bytes from the input byte stream
for the key data is still a bit on the suspicious side, but at least
it won't crash UBSAN anymore.
This commit is contained in:
Andrew Kaster 2021-06-27 23:38:48 -06:00 • committed by Ali Mohammad Pur
parent 3058ff1500
commit 97444f0a25
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Libraries/LibCrypto/Authentication/GHash.h
View file

@ -6,6 +6,7 @@
#pragma once #pragma once
#include <AK/ByteReader.h>
#include <AK/String.h> #include <AK/String.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <LibCrypto/Hash/HashFunction.h> #include <LibCrypto/Hash/HashFunction.h>
@ -35,8 +36,10 @@ public:
explicit GHash(const ReadonlyBytes& key) explicit GHash(const ReadonlyBytes& key)
{ {
for (size_t i = 0; i < 16; i += 4) VERIFY(key.size() >= 16);
m_key[i / 4] = AK::convert_between_host_and_big_endian(*(const u32*)(key.offset(i))); for (size_t i = 0; i < 16; i += 4) {
m_key[i / 4] = AK::convert_between_host_and_big_endian(ByteReader::load32(key.offset(i)));
}
} }
constexpr static size_t digest_size() { return TagType::Size; } constexpr static size_t digest_size() { return TagType::Size; }