Move net/base/sys_byteorder.h to base/sys_byteorder.h

crypto/encryptor.cc

 // 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)
-#elif defined(OS_OPENBSD)
-#include <sys/endian.h>
-#define bswap_16(x) swap16(x)
-#define bswap_32(x) swap32(x)
-#define bswap_64(x) swap64(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
+#include "base/sys_byteorder.h"
 
 namespace crypto {
 
 /////////////////////////////////////////////////////////////////////////////
 // Encyptor::Counter Implementation.
 Encryptor::Counter::Counter(const base::StringPiece& counter) {
   CHECK(sizeof(counter_) == counter.length());
 
   memcpy(&counter_, counter.data(), sizeof(counter_));
 }
 
 Encryptor::Counter::~Counter() {
 }
 
 bool Encryptor::Counter::Increment() {
-  uint64 low_num = ntoh_64(counter_.components64[1]);
+  uint64 low_num = base::ntohll(counter_.components64[1]);
   uint64 new_low_num = low_num + 1;
-  counter_.components64[1] = hton_64(new_low_num);
+  counter_.components64[1] = base::htonll(new_low_num);
 
   // If overflow occured then increment the most significant component.
   if (new_low_num < low_num) {
     counter_.components64[0] =
-        hton_64(ntoh_64(counter_.components64[0]) + 1);
+        base::htonll(base::ntohll(counter_.components64[0]) + 1);
   }
 
   // TODO(hclam): Return false if counter value overflows.
   return true;
 }
 
 void Encryptor::Counter::Write(void* buf) {
   uint8* buf_ptr = reinterpret_cast<uint8*>(buf);
   memcpy(buf_ptr, &counter_, sizeof(counter_));
 }
@@ skipping 46 matching lines @@
   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