OpenBSD patches for net, split from CR #8275005

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)
+#define bswap_16(x) swap16(x)
+#define bswap_32(x) swap32(x)
+#define bswap_64(x) swap64(x)

[wtc, 2011/10/18 21:50:26]

Just curious: are swap16, swap32, and swap64 compiler built-in
functions?  I'm just wondering why you don't need to include
a header for these functions.

[Robert Nagy, 2011/10/19 07:10:02]

They are defined in sys/endian.h so I just included that to be on the safe side
of things.

 #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)
@@ skipping 80 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