Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(560)

Unified Diff: crypto/encryptor.cc

Issue 7056026: Implement AES-CTR for NSS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: endian Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: crypto/encryptor.cc
diff --git a/crypto/encryptor.cc b/crypto/encryptor.cc
new file mode 100644
index 0000000000000000000000000000000000000000..bffe05c26a8d06c70bf40c4c87ebffba73ed028f
--- /dev/null
+++ b/crypto/encryptor.cc
@@ -0,0 +1,123 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "crypto/encryptor.h"
+
+#include "base/logging.h"
+#include "build/build_config.h"
+
+// Include headers to provide bswap for all platforms.
+#if defined(COMPILER_MSVC)
+#include <stdlib.h>
+#define bswap_16(x) _byteswap_ushort(x)
+#define bswap_32(x) _byteswap_ulong(x)
+#define bswap_64(x) _byteswap_uint64(x)
+#elif defined(OS_MACOSX)
+#include <libkern/OSByteOrder.h>
+#define bswap_16(x) OSSwapInt16(x)
+#define bswap_32(x) OSSwapInt32(x)
+#define bswap_64(x) OSSwapInt64(x)
+#else
+#include <byteswap.h>
+#endif
+
+#if defined(ARCH_CPU_LITTLE_ENDIAN)
+#define ntoh_64(x) bswap_64(x)
+#define hton_64(x) bswap_64(x)
+#else
+#define ntoh_64(x) (x)
+#define hton_64(x) (x)
+#endif
+
+namespace crypto {
+
+namespace {
+const size_t kCounterLength = 16u;
+} // namespace
+
+/////////////////////////////////////////////////////////////////////////////
+// Encyptor::Counter Implementation.
+Encryptor::Counter::Counter(const std::string& counter)
+ : counter_bits_(kCounterLength * 8) {
+ // Check the endianness at runtime and complain if this is not little
+ // endian.
+ int endian_check = 1;
+ CHECK_EQ(*reinterpret_cast<int8*>(&endian_check), 1)
+ << "This code only runs in little endian system";
wtc 2011/06/24 18:06:06 Delete the runtime endianness check (lines 43-47).
Alpha Left Google 2011/06/24 18:52:27 Done.
+ CHECK_EQ(kCounterLength, counter.length());
+
+ memcpy(counter_.buf, counter.data(), kCounterLength);
wtc 2011/06/24 18:06:06 This should be memcpy(&counter_, counter.data(),
Alpha Left Google 2011/06/24 18:52:27 Done.
+}
+
+Encryptor::Counter::~Counter() {
+}
+
+void Encryptor::Counter::Increment() {
+ uint64 low_num = ntoh_64(counter_.components64[1]);
+ uint64 new_low_num = low_num + 1;
+ counter_.components64[1] = hton_64(new_low_num);
+
+ // Overflow occured then increment the most significant component.
wtc 2011/06/24 18:06:06 Add "If".
Alpha Left Google 2011/06/24 18:52:27 Done.
+ if (new_low_num < low_num) {
+ counter_.components64[0] =
+ hton_64(ntoh_64(counter_.components64[0]) + 1);
+ }
+}
+
+void Encryptor::Counter::Write(void* buf) {
+ uint8* buf_ptr = reinterpret_cast<uint8*>(buf);
+ memcpy(buf_ptr, counter_.buf, kCounterLength);
wtc 2011/06/24 18:06:06 This function can simply say: memcpy(buf, &count
Alpha Left Google 2011/06/24 18:52:27 Done.
+}
+
+size_t Encryptor::Counter::GetLengthInBytes() const {
+ return counter_bits_ / 8;
wtc 2011/06/24 18:06:06 This should be return sizeof(counter_);
Alpha Left Google 2011/06/24 18:52:27 Done.
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// Partial Encryptor Implementation.
+
+bool Encryptor::UpdateCounter(const std::string& counter) {
+ if (mode_ != CTR)
+ return false;
+ if (counter.length() != kCounterLength)
+ return false;
+
+ counter_.reset(new Counter(counter));
+ return true;
+}
+
+void Encryptor::GenerateCounterMask(size_t plaintext_len,
+ uint8* mask,
+ size_t* mask_len) {
+ DCHECK_EQ(CTR, mode_);
+ CHECK(mask);
+ CHECK(mask_len);
+
+ const size_t kBlockLength = counter_->GetLengthInBytes();
+ size_t blocks = (plaintext_len + kBlockLength - 1) / kBlockLength;
+ CHECK(blocks);
+
+ *mask_len = blocks * kBlockLength;
+
+ for (size_t i = 0; i < blocks; ++i) {
+ counter_->Write(mask);
+ mask += kBlockLength;
+ counter_->Increment();
+ }
+}
+
+void Encryptor::MaskMessage(const void* plaintext,
+ size_t plaintext_len,
+ const void* mask,
+ void* ciphertext) const {
+ DCHECK_EQ(CTR, mode_);
+ const uint8* plaintext_ptr = reinterpret_cast<const uint8*>(plaintext);
+ const uint8* mask_ptr = reinterpret_cast<const uint8*>(mask);
+ uint8* ciphertext_ptr = reinterpret_cast<uint8*>(ciphertext);
+
+ for (size_t i = 0; i < plaintext_len; ++i)
+ ciphertext_ptr[i] = plaintext_ptr[i] ^ mask_ptr[i];
+}
+
+} // namespace crypto

Powered by Google App Engine
This is Rietveld 408576698