Removing NSS files and USE_OPENSSL flag

net/http/des.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 "net/http/des.h"
 
 #include "base/logging.h"
 
-#if defined(USE_OPENSSL)
 #include <openssl/des.h>
 #include "crypto/openssl_util.h"
-#elif defined(OS_IOS)
-#include <CommonCrypto/CommonCryptor.h>
-#else
-#error "Unknown platform"
-#endif
 
 // The iOS version of DESEncrypt is our own code.
 // DESSetKeyParity and DESMakeKey are based on
 // mozilla/security/manager/ssl/src/nsNTLMAuthModule.cpp, CVS rev. 1.14.
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
@@ skipping 46 matching lines @@
   key[0] = DESSetKeyParity(raw[0]);
   key[1] = DESSetKeyParity((raw[0] << 7) | (raw[1] >> 1));
   key[2] = DESSetKeyParity((raw[1] << 6) | (raw[2] >> 2));
   key[3] = DESSetKeyParity((raw[2] << 5) | (raw[3] >> 3));
   key[4] = DESSetKeyParity((raw[3] << 4) | (raw[4] >> 4));
   key[5] = DESSetKeyParity((raw[4] << 3) | (raw[5] >> 5));
   key[6] = DESSetKeyParity((raw[5] << 2) | (raw[6] >> 6));
   key[7] = DESSetKeyParity((raw[6] << 1));
 }
 
-#if defined(USE_OPENSSL)
-
 void DESEncrypt(const uint8_t* key, const uint8_t* src, uint8_t* hash) {
   crypto::EnsureOpenSSLInit();
 
   DES_key_schedule ks;
   DES_set_key(
       reinterpret_cast<const DES_cblock*>(key), &ks);
 
   DES_ecb_encrypt(reinterpret_cast<const DES_cblock*>(src),
                   reinterpret_cast<DES_cblock*>(hash), &ks, DES_ENCRYPT);
 }
 
-#elif defined(OS_IOS)

[Ryan Sleevi, 2016/04/18 14:23:30]

I'm torn on this.

Semantically, your change is correct. However, objectively, the iOS CCrypto code
should be universally faster than BoringSSL code, due to Apple-specific
optimizations here.

I'll LG this, but maybe a conversation worth following-up with David (e.g.
should our BoringSSL-on-iOS code call the CommonCrypto routines on iOS)

[svaldez, 2016/04/18 15:09:35]

Acknowledged.

-
-void DESEncrypt(const uint8_t* key, const uint8_t* src, uint8_t* hash) {
-  CCCryptorStatus status;
-  size_t data_out_moved = 0;
-  status = CCCrypt(kCCEncrypt, kCCAlgorithmDES, kCCOptionECBMode,
-                   key, 8, NULL, src, 8, hash, 8, &data_out_moved);
-  DCHECK(status == kCCSuccess);
-  DCHECK(data_out_moved == 8);
-}
-
-#endif
-
 }  // namespace net