Skip to content

Commit c5b2980

Browse files
UgnineSirdisUgnineSirdis
authored
Rename EncryptFile/DecryptFile to avoid conflict with windows functions (#15116)
1 parent 7b6b1a9 commit c5b2980

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

‎ydb/core/backup/common/encryption.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ TBuffer TEncryptedFileSerializer::AddBlock(TStringBuf data, bool last) {
387387
return Impl->AddBlock(data, last);
388388
}
389389

390-
TBuffer TEncryptedFileSerializer::EncryptFile(TString algorithm, TEncryptionKey key, TEncryptionIV iv, TStringBuf data) {
390+
TBuffer TEncryptedFileSerializer::EncryptFullFile(TString algorithm, TEncryptionKey key, TEncryptionIV iv, TStringBuf data) {
391391
TEncryptedFileSerializer serializer(std::move(algorithm), std::move(key), std::move(iv));
392392
return serializer.AddBlock(data, true);
393393
}
@@ -853,7 +853,7 @@ std::pair<TBuffer, TEncryptionIV> TEncryptedFileDeserializer::DecryptFile(TEncry
853853
return {std::move(*result), deserializer.GetIV()};
854854
}
855855

856-
TBuffer TEncryptedFileDeserializer::DecryptFile(TEncryptionKey key, TEncryptionIV expectedIV, TBuffer data) {
856+
TBuffer TEncryptedFileDeserializer::DecryptFullFile(TEncryptionKey key, TEncryptionIV expectedIV, TBuffer data) {
857857
TEncryptedFileDeserializer deserializer(std::move(key), std::move(expectedIV));
858858
deserializer.AddData(std::move(data), true);
859859

‎ydb/core/backup/common/encryption.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ class TEncryptedFileSerializer {
181181
TBuffer AddBlock(TStringBuf data, bool last);
182182

183183
// Helper that serializes the whole file at one time
184-
static TBuffer EncryptFile(TString algorithm, TEncryptionKey key, TEncryptionIV iv, TStringBuf data);
184+
static TBuffer EncryptFullFile(TString algorithm, TEncryptionKey key, TEncryptionIV iv, TStringBuf data);
185185

186186
private:
187187
class TImpl;
@@ -224,7 +224,7 @@ class TEncryptedFileDeserializer {
224224

225225
// Helper that deserializes the whole file at one time
226226
static std::pair<TBuffer, TEncryptionIV> DecryptFile(TEncryptionKey key, TBuffer data);
227-
static TBuffer DecryptFile(TEncryptionKey key, TEncryptionIV expectedIV, TBuffer data);
227+
static TBuffer DecryptFullFile(TEncryptionKey key, TEncryptionIV expectedIV, TBuffer data);
228228

229229
private:
230230
class TImpl;

‎ydb/core/backup/common/encryption_ut.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ const TEncryptionKey& SelectKey(const TString& alg) {
2828
Y_UNIT_TEST_SUITE(EncryptedFileSerializerTest) {
2929
Y_UNIT_TEST(SerializeWholeFileAtATime) {
3030
TEncryptionIV iv = TEncryptionIV::Generate();
31-
TBuffer fileData = TEncryptedFileSerializer::EncryptFile("aes-128_gcm", Key16, iv, "short data file");
32-
TBuffer data = TEncryptedFileDeserializer::DecryptFile(Key16, iv, fileData);
31+
TBuffer fileData = TEncryptedFileSerializer::EncryptFullFile("aes-128_gcm", Key16, iv, "short data file");
32+
TBuffer data = TEncryptedFileDeserializer::DecryptFullFile(Key16, iv, fileData);
3333
TString dataStr;
3434
data.AsString(dataStr);
3535
UNIT_ASSERT_STRINGS_EQUAL(dataStr, "short data file");
@@ -50,9 +50,9 @@ Y_UNIT_TEST_SUITE(EncryptedFileSerializerTest) {
5050

5151
Y_UNIT_TEST(WrongParametersForDeserializer) {
5252
TEncryptionIV iv = TEncryptionIV::Generate();
53-
TBuffer testData = TEncryptedFileSerializer::EncryptFile("chacha-20-poly1305", Key32, iv, "test data");
53+
TBuffer testData = TEncryptedFileSerializer::EncryptFullFile("chacha-20-poly1305", Key32, iv, "test data");
5454
UNIT_ASSERT_EXCEPTION_CONTAINS(TEncryptedFileDeserializer::DecryptFile(Key16, testData), yexception, "Invalid key length 16. Expected: 32");
55-
UNIT_ASSERT_EXCEPTION_CONTAINS(TEncryptedFileDeserializer::DecryptFile(Key16, TEncryptionIV::Generate(), testData), yexception, "File is corrupted");
55+
UNIT_ASSERT_EXCEPTION_CONTAINS(TEncryptedFileDeserializer::DecryptFullFile(Key16, TEncryptionIV::Generate(), testData), yexception, "File is corrupted");
5656
}
5757

5858
Y_UNIT_TEST(SplitOnBlocks) {
@@ -119,7 +119,7 @@ Y_UNIT_TEST_SUITE(EncryptedFileSerializerTest) {
119119

120120
Y_UNIT_TEST(EmptyFile) {
121121
TEncryptionIV iv = TEncryptionIV::Generate();
122-
TBuffer fileData = TEncryptedFileSerializer::EncryptFile("aes-128_gcm", Key16, iv, TStringBuf());
122+
TBuffer fileData = TEncryptedFileSerializer::EncryptFullFile("aes-128_gcm", Key16, iv, TStringBuf());
123123

124124
auto [buffer, headerIV] = TEncryptedFileDeserializer::DecryptFile(Key16, fileData);
125125
UNIT_ASSERT_VALUES_EQUAL(buffer.Size(), 0);
@@ -138,7 +138,7 @@ Y_UNIT_TEST_SUITE(EncryptedFileSerializerTest) {
138138
Y_UNIT_TEST(ReadPartial) {
139139
for (const TString& alg : Algorithms) {
140140
TEncryptionIV iv = TEncryptionIV::Generate();
141-
TBuffer fileData = TEncryptedFileSerializer::EncryptFile(alg, SelectKey(alg), iv, "encrypted text");
141+
TBuffer fileData = TEncryptedFileSerializer::EncryptFullFile(alg, SelectKey(alg), iv, "encrypted text");
142142

143143
TBuffer allButLastBlock(fileData.Data(), fileData.Size() - 20);
144144
TBuffer lastBlock(fileData.Data() + fileData.Size() - 20, 20);
@@ -156,14 +156,14 @@ Y_UNIT_TEST_SUITE(EncryptedFileSerializerTest) {
156156

157157
Y_UNIT_TEST(DeleteLastByte) {
158158
TEncryptionIV iv = TEncryptionIV::Generate();
159-
TBuffer fileData = TEncryptedFileSerializer::EncryptFile("aes-256_gcm", Key32, iv, "short data file");
159+
TBuffer fileData = TEncryptedFileSerializer::EncryptFullFile("aes-256_gcm", Key32, iv, "short data file");
160160
fileData.Resize(fileData.Size() - 1);
161161
UNIT_ASSERT_EXCEPTION_CONTAINS(TEncryptedFileDeserializer::DecryptFile(Key32, fileData), yexception, "File is corrupted");
162162
}
163163

164164
Y_UNIT_TEST(AddByte) {
165165
TEncryptionIV iv = TEncryptionIV::Generate();
166-
TBuffer fileData = TEncryptedFileSerializer::EncryptFile("aes-256_gcm", Key32, iv, "short data file");
166+
TBuffer fileData = TEncryptedFileSerializer::EncryptFullFile("aes-256_gcm", Key32, iv, "short data file");
167167
fileData.Resize(fileData.Size() + 1);
168168
UNIT_ASSERT_EXCEPTION_CONTAINS(TEncryptedFileDeserializer::DecryptFile(Key32, fileData), yexception, "File is corrupted");
169169

@@ -183,7 +183,7 @@ Y_UNIT_TEST_SUITE(EncryptedFileSerializerTest) {
183183
Y_UNIT_TEST(RemoveLastBlock) {
184184
for (const TString& alg : Algorithms) {
185185
TEncryptionIV iv = TEncryptionIV::Generate();
186-
TBuffer fileData = TEncryptedFileSerializer::EncryptFile(alg, SelectKey(alg), iv, "encrypted text");
186+
TBuffer fileData = TEncryptedFileSerializer::EncryptFullFile(alg, SelectKey(alg), iv, "encrypted text");
187187

188188
fileData.Resize(fileData.Size() - 20); // remove last block
189189
TEncryptedFileDeserializer deserializer(SelectKey(alg));
@@ -201,7 +201,7 @@ Y_UNIT_TEST_SUITE(EncryptedFileSerializerTest) {
201201
Y_UNIT_TEST(ChangeAnyByte) {
202202
for (const TString& alg : Algorithms) {
203203
TEncryptionIV iv = TEncryptionIV::Generate();
204-
TBuffer fileData = TEncryptedFileSerializer::EncryptFile(alg, SelectKey(alg), iv, "test text");
204+
TBuffer fileData = TEncryptedFileSerializer::EncryptFullFile(alg, SelectKey(alg), iv, "test text");
205205
for (size_t i = 0; i < fileData.Size(); ++i) {
206206
TBuffer modified = fileData;
207207
modified.Data()[i] ^= 1;
@@ -212,7 +212,7 @@ Y_UNIT_TEST_SUITE(EncryptedFileSerializerTest) {
212212

213213
Y_UNIT_TEST(BigHeaderSize) {
214214
TEncryptionIV iv = TEncryptionIV::Generate();
215-
TBuffer fileData = TEncryptedFileSerializer::EncryptFile("AES-128-GCM", Key16, iv, "test text");
215+
TBuffer fileData = TEncryptedFileSerializer::EncryptFullFile("AES-128-GCM", Key16, iv, "test text");
216216
// Make header big
217217
fileData.Data()[0] = char(-1);
218218
UNIT_ASSERT_EXCEPTION_CONTAINS(TEncryptedFileDeserializer::DecryptFile(Key16, fileData), yexception, "File is corrupted");
@@ -239,7 +239,7 @@ Y_UNIT_TEST_SUITE(EncryptedFileSerializerTest) {
239239
Y_UNIT_TEST(BigBlockSize) {
240240
TEncryptionIV iv = TEncryptionIV::Generate();
241241
TStringBuf srcText = "File with too big block size";
242-
TBuffer fileData = TEncryptedFileSerializer::EncryptFile("AES-256-GCM", Key32, iv, srcText);
242+
TBuffer fileData = TEncryptedFileSerializer::EncryptFullFile("AES-256-GCM", Key32, iv, srcText);
243243
size_t blockSizePos = fileData.Size() - 20 /* last block with MAC */ - 16 /* MAC */ - srcText.size() - 4 /* sizeof(size) */;
244244
UNIT_ASSERT_LT(blockSizePos, fileData.Size() - 4);
245245
uint32_t* size = reinterpret_cast<uint32_t*>(fileData.Data() + blockSizePos);

0 commit comments

Comments
 (0)