Skip to content

Commit bd2d54c

Browse files
author
eroman@chromium.org
committed
Rename "decypted" to "decrypted".
I presume this was a typo that got replicated throughout encryptor_unittest.cc BUG=NONE Review URL: https://codereview.chromium.org/25163002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225951 0039d316-1c4b-4281-b951-d872f2087c98
1 parent 41cd0fd commit bd2d54c

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

crypto/encryptor_unittest.cc

+28-28
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ TEST(EncryptorTest, EncryptDecrypt) {
2929

3030
EXPECT_LT(0U, ciphertext.size());
3131

32-
std::string decypted;
33-
EXPECT_TRUE(encryptor.Decrypt(ciphertext, &decypted));
32+
std::string decrypted;
33+
EXPECT_TRUE(encryptor.Decrypt(ciphertext, &decrypted));
3434

35-
EXPECT_EQ(plaintext, decypted);
35+
EXPECT_EQ(plaintext, decrypted);
3636
}
3737

3838
TEST(EncryptorTest, DecryptWrongKey) {
@@ -84,7 +84,7 @@ TEST(EncryptorTest, DecryptWrongKey) {
8484
static_cast<unsigned char>(ciphertext[i]));
8585
}
8686

87-
std::string decypted;
87+
std::string decrypted;
8888

8989
// This wrong key causes the last padding byte to be 5, which is a valid
9090
// padding length, and the second to last padding byte to be 137, which is
@@ -95,21 +95,21 @@ TEST(EncryptorTest, DecryptWrongKey) {
9595
#if !defined(USE_NSS) && !defined(OS_WIN) && !defined(OS_MACOSX)
9696
crypto::Encryptor decryptor;
9797
EXPECT_TRUE(decryptor.Init(wrong_key.get(), crypto::Encryptor::CBC, iv));
98-
EXPECT_FALSE(decryptor.Decrypt(ciphertext, &decypted));
98+
EXPECT_FALSE(decryptor.Decrypt(ciphertext, &decrypted));
9999
#endif
100100

101101
// This demonstrates that not all wrong keys can be detected by padding
102102
// error. This wrong key causes the last padding byte to be 1, which is
103103
// a valid padding block of length 1.
104104
crypto::Encryptor decryptor2;
105105
EXPECT_TRUE(decryptor2.Init(wrong_key2.get(), crypto::Encryptor::CBC, iv));
106-
EXPECT_TRUE(decryptor2.Decrypt(ciphertext, &decypted));
106+
EXPECT_TRUE(decryptor2.Decrypt(ciphertext, &decrypted));
107107

108108
// This wrong key causes the last padding byte to be 253, which should be
109109
// rejected by all implementations.
110110
crypto::Encryptor decryptor3;
111111
EXPECT_TRUE(decryptor3.Init(wrong_key3.get(), crypto::Encryptor::CBC, iv));
112-
EXPECT_FALSE(decryptor3.Decrypt(ciphertext, &decypted));
112+
EXPECT_FALSE(decryptor3.Decrypt(ciphertext, &decrypted));
113113
}
114114

115115
namespace {
@@ -205,11 +205,11 @@ void TestAESCTREncrypt(
205205
EXPECT_EQ(ciphertext_size, encrypted.size());
206206
EXPECT_EQ(0, memcmp(encrypted.data(), ciphertext, encrypted.size()));
207207

208-
std::string decypted;
208+
std::string decrypted;
209209
EXPECT_TRUE(encryptor.SetCounter(init_counter_str));
210-
EXPECT_TRUE(encryptor.Decrypt(encrypted, &decypted));
210+
EXPECT_TRUE(encryptor.Decrypt(encrypted, &decrypted));
211211

212-
EXPECT_EQ(plaintext_str, decypted);
212+
EXPECT_EQ(plaintext_str, decrypted);
213213
}
214214

215215
void TestAESCTRMultipleDecrypt(
@@ -236,12 +236,12 @@ void TestAESCTRMultipleDecrypt(
236236

237237
int offset = 0;
238238
for (size_t i = 0; i < arraysize(kTestDecryptSizes); ++i) {
239-
std::string decypted;
239+
std::string decrypted;
240240
size_t len = kTestDecryptSizes[i];
241241
EXPECT_TRUE(
242-
encryptor.Decrypt(ciphertext_str.substr(offset, len), &decypted));
243-
EXPECT_EQ(len, decypted.size());
244-
EXPECT_EQ(0, memcmp(decypted.data(), plaintext + offset, len));
242+
encryptor.Decrypt(ciphertext_str.substr(offset, len), &decrypted));
243+
EXPECT_EQ(len, decrypted.size());
244+
EXPECT_EQ(0, memcmp(decrypted.data(), plaintext + offset, len));
245245
offset += len;
246246
}
247247
}
@@ -296,19 +296,19 @@ TEST(EncryptorTest, EncryptDecryptCTR) {
296296
EXPECT_TRUE(encryptor.Encrypt(plaintext, &ciphertext));
297297
EXPECT_LT(0U, ciphertext.size());
298298

299-
std::string decypted;
299+
std::string decrypted;
300300
EXPECT_TRUE(encryptor.SetCounter(kInitialCounter));
301-
EXPECT_TRUE(encryptor.Decrypt(ciphertext, &decypted));
302-
EXPECT_EQ(plaintext, decypted);
301+
EXPECT_TRUE(encryptor.Decrypt(ciphertext, &decrypted));
302+
EXPECT_EQ(plaintext, decrypted);
303303

304304
plaintext = "0123456789012345";
305305
EXPECT_TRUE(encryptor.SetCounter(kInitialCounter));
306306
EXPECT_TRUE(encryptor.Encrypt(plaintext, &ciphertext));
307307
EXPECT_LT(0U, ciphertext.size());
308308

309309
EXPECT_TRUE(encryptor.SetCounter(kInitialCounter));
310-
EXPECT_TRUE(encryptor.Decrypt(ciphertext, &decypted));
311-
EXPECT_EQ(plaintext, decypted);
310+
EXPECT_TRUE(encryptor.Decrypt(ciphertext, &decrypted));
311+
EXPECT_EQ(plaintext, decrypted);
312312
}
313313

314314
TEST(EncryptorTest, CTRCounter) {
@@ -422,10 +422,10 @@ TEST(EncryptorTest, EncryptAES256CBC) {
422422
EXPECT_EQ(sizeof(kRawCiphertext), ciphertext.size());
423423
EXPECT_EQ(0, memcmp(ciphertext.data(), kRawCiphertext, ciphertext.size()));
424424

425-
std::string decypted;
426-
EXPECT_TRUE(encryptor.Decrypt(ciphertext, &decypted));
425+
std::string decrypted;
426+
EXPECT_TRUE(encryptor.Decrypt(ciphertext, &decrypted));
427427

428-
EXPECT_EQ(plaintext, decypted);
428+
EXPECT_EQ(plaintext, decrypted);
429429
}
430430

431431
// Expected output derived from the NSS implementation.
@@ -451,9 +451,9 @@ TEST(EncryptorTest, EncryptAES128CBCRegression) {
451451
EXPECT_EQ(expected_ciphertext_hex, base::HexEncode(ciphertext.data(),
452452
ciphertext.size()));
453453

454-
std::string decypted;
455-
EXPECT_TRUE(encryptor.Decrypt(ciphertext, &decypted));
456-
EXPECT_EQ(plaintext, decypted);
454+
std::string decrypted;
455+
EXPECT_TRUE(encryptor.Decrypt(ciphertext, &decrypted));
456+
EXPECT_EQ(plaintext, decrypted);
457457
}
458458

459459
// Expected output derived from the NSS implementation.
@@ -477,9 +477,9 @@ TEST(EncryptorTest, EncryptAES192CBCRegression) {
477477
EXPECT_EQ(expected_ciphertext_hex, base::HexEncode(ciphertext.data(),
478478
ciphertext.size()));
479479

480-
std::string decypted;
481-
EXPECT_TRUE(encryptor.Decrypt(ciphertext, &decypted));
482-
EXPECT_EQ(plaintext, decypted);
480+
std::string decrypted;
481+
EXPECT_TRUE(encryptor.Decrypt(ciphertext, &decrypted));
482+
EXPECT_EQ(plaintext, decrypted);
483483
}
484484

485485
// Not all platforms allow import/generation of symmetric keys with an

0 commit comments

Comments
 (0)