gitea-mirror/git-crypt
1
0
Fork 0
mirror of https://github.com/AGWA/git-crypt.git synced 2025-12-05 20:40:05 -08:00
Code Issues Packages Projects Releases Wiki Activity

Raise an error if legacy key file has trailing data

Browse Source
This commit is contained in:
Andrew Ayer
2014-09-06 14:59:16 -07:00
parent f50feec2dd
commit 10622f6dcc
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
key.cpp
View File

@@ -117,6 +117,13 @@ void Key_file::Entry::load_legacy (uint32_t arg_version, std::istream& in)
if (in.gcount() != HMAC_KEY_LEN) { if (in.gcount() != HMAC_KEY_LEN) {
throw Malformed(); throw Malformed();
} }
if (in.peek() != -1) {
// Trailing data is a good indication that we are not actually reading a
// legacy key file. (This is important to check since legacy key files
// did not have any sort of file header.)
throw Malformed();
}
} }
void Key_file::Entry::store (std::ostream& out) const void Key_file::Entry::store (std::ostream& out) const