wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8258 from sfc-gh-tclinkenbeard/remove-applyHmacKeyDerivationFunc 

Remove dead code for `applyHmacKeyDerivationFunc`
This commit is contained in:
Trevor Clinkenbeard 2022-09-21 11:53:35 -07:00 committed by GitHub
parent 1f015b7e1a 436cdff912
commit 999e20a7a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
flow/StreamCipher.cpp
View File

@ -113,16 +113,6 @@ void StreamCipher::cleanup() noexcept {
}
}
void applyHmacKeyDerivationFunc(StreamCipherKey* cipherKey, HmacSha256StreamCipher* hmacGenerator, Arena& arena) {
uint8_t buf[cipherKey->size() + sizeof(uint64_t)];
memcpy(&buf[0], cipherKey->data(), cipherKey->size());
uint64_t seed = deterministicRandom()->randomUInt64();
memcpy(&buf[0] + cipherKey->size(), &seed, sizeof(uint64_t));
StringRef digest = hmacGenerator->digest(&buf[0], cipherKey->size() + sizeof(uint64_t), arena);
std::copy(digest.begin(), digest.end(), &buf[0]);
cipherKey->initializeKey(&buf[0], cipherKey->size());
}
EncryptionStreamCipher::EncryptionStreamCipher(const StreamCipherKey* key, const StreamCipher::IV& iv)
: cipher(StreamCipher(key->size())) {
EVP_EncryptInit_ex(cipher.getCtx(), EVP_aes_256_gcm(), nullptr, nullptr, nullptr);
@ -173,15 +163,6 @@ HmacSha256StreamCipher::HmacSha256StreamCipher() : cipher(EVP_MAX_KEY_LENGTH) {
HMAC_Init_ex(cipher.getHmacCtx(), NULL, 0, EVP_sha256(), nullptr);
}
StringRef HmacSha256StreamCipher::digest(unsigned char const* data, int len, Arena& arena) {
CODE_PROBE(true, "Digest using StreamCipher");
unsigned int digestLen = HMAC_size(cipher.getHmacCtx());
auto digest = new (arena) unsigned char[digestLen];
HMAC_Update(cipher.getHmacCtx(), data, len);
HMAC_Final(cipher.getHmacCtx(), digest, &digestLen);
return StringRef(digest, digestLen);
}
StringRef HmacSha256StreamCipher::finish(Arena& arena) {
unsigned int digestLen = HMAC_size(cipher.getHmacCtx());
auto digest = new (arena) unsigned char[digestLen];

3
flow/include/flow/StreamCipher.h
View File

@ -104,8 +104,5 @@ class HmacSha256StreamCipher final : NonCopyable, public ReferenceCounted<HmacSh
public:
HmacSha256StreamCipher();
StringRef digest(unsigned char const* data, int len, Arena&);
StringRef finish(Arena&);
};
void applyHmacKeyDerivationFunc(StreamCipherKey* cipherKey, HmacSha256StreamCipher* hmacGenerator, Arena& arena);