src/crypto should build on the x86_64 architecture.

crypto/mock_keychain_mac.cc

 // Copyright (c) 2012 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 "base/logging.h"
 #include "base/time.h"
 #include "crypto/mock_keychain_mac.h"
 
 namespace crypto {
 
+const SecKeychainSearchRef MockKeychain::kDummySearchRef =
+    reinterpret_cast<SecKeychainSearchRef>(1000);
+
 MockKeychain::MockKeychain()
     : next_item_key_(0),
       search_copy_count_(0),
       keychain_item_copy_count_(0),
       attribute_data_copy_count_(0),
       find_generic_result_(noErr),
       called_add_generic_(false),
       password_data_count_(0) {}
 
-void MockKeychain::InitializeKeychainData(unsigned int key) const {
+void MockKeychain::InitializeKeychainData(MockKeychainItemType key) const {
   UInt32 tags[] = { kSecAccountItemAttr,
                     kSecServerItemAttr,
                     kSecPortItemAttr,
                     kSecPathItemAttr,
                     kSecProtocolItemAttr,
                     kSecAuthenticationTypeItemAttr,
                     kSecSecurityDomainItemAttr,
                     kSecCreationDateItemAttr,
                     kSecNegativeItemAttr,
                     kSecCreatorItemAttr };
@@ skipping 23 matching lines @@
         break;
     }
     if (data_size > 0) {
       keychain_attr_list_[key].attr[i].length = data_size;
       keychain_attr_list_[key].attr[i].data = calloc(1, data_size);
     }
   }
 }
 
 MockKeychain::~MockKeychain() {
-  for (std::map<unsigned int, SecKeychainAttributeList>::iterator it =
+  for (std::map<MockKeychainItemType, SecKeychainAttributeList>::iterator it =
        keychain_attr_list_.begin(); it != keychain_attr_list_.end(); ++it) {
     for (unsigned int i = 0; i < it->second.count; ++i) {
       if (it->second.attr[i].data)
         free(it->second.attr[i].data);
     }
     free(it->second.attr);
     if (keychain_data_[it->first].data)
       free(keychain_data_[it->first].data);
   }
   keychain_attr_list_.clear();
@@ skipping 10 matching lines @@
       break;
     }
   }
   if (attribute_index == -1) {
     NOTREACHED() << "Unsupported attribute: " << tag;
     return NULL;
   }
   return &(attribute_list.attr[attribute_index]);
 }
 
-void MockKeychain::SetTestDataBytes(int item,
+void MockKeychain::SetTestDataBytes(MockKeychainItemType item,
                                     UInt32 tag,
                                     const void* data,
                                     size_t length) {
   SecKeychainAttribute* attribute = AttributeWithTag(keychain_attr_list_[item],
                                                      tag);
   attribute->length = length;
   if (length > 0) {
     if (attribute->data)
       free(attribute->data);
     attribute->data = malloc(length);
     CHECK(attribute->data);
     memcpy(attribute->data, data, length);
   } else {
     attribute->data = NULL;
   }
 }
 
-void MockKeychain::SetTestDataString(int item, UInt32 tag, const char* value) {
+void MockKeychain::SetTestDataString(
+    MockKeychainItemType item,
+    UInt32 tag,
+    const char* value) {
   SetTestDataBytes(item, tag, value, value ? strlen(value) : 0);
 }
 
-void MockKeychain::SetTestDataPort(int item, UInt32 value) {
+void MockKeychain::SetTestDataPort(MockKeychainItemType item, UInt32 value) {
   SecKeychainAttribute* attribute = AttributeWithTag(keychain_attr_list_[item],
                                                      kSecPortItemAttr);
   UInt32* data = static_cast<UInt32*>(attribute->data);
   *data = value;
 }
 
-void MockKeychain::SetTestDataProtocol(int item, SecProtocolType value) {
+void MockKeychain::SetTestDataProtocol(MockKeychainItemType item,
+                                       SecProtocolType value) {
   SecKeychainAttribute* attribute = AttributeWithTag(keychain_attr_list_[item],
                                                      kSecProtocolItemAttr);
   SecProtocolType* data = static_cast<SecProtocolType*>(attribute->data);
   *data = value;
 }
 
-void MockKeychain::SetTestDataAuthType(int item, SecAuthenticationType value) {
+void MockKeychain::SetTestDataAuthType(
+    MockKeychainItemType item,
+    SecAuthenticationType value) {
   SecKeychainAttribute* attribute = AttributeWithTag(
       keychain_attr_list_[item], kSecAuthenticationTypeItemAttr);
   SecAuthenticationType* data = static_cast<SecAuthenticationType*>(
       attribute->data);
   *data = value;
 }
 
-void MockKeychain::SetTestDataNegativeItem(int item, Boolean value) {
+void MockKeychain::SetTestDataNegativeItem(MockKeychainItemType item,
+                                           Boolean value) {
   SecKeychainAttribute* attribute = AttributeWithTag(keychain_attr_list_[item],
                                                      kSecNegativeItemAttr);
   Boolean* data = static_cast<Boolean*>(attribute->data);
   *data = value;
 }
 
-void MockKeychain::SetTestDataCreator(int item, OSType value) {
+void MockKeychain::SetTestDataCreator(MockKeychainItemType item, OSType value) {
   SecKeychainAttribute* attribute = AttributeWithTag(keychain_attr_list_[item],
                                                      kSecCreatorItemAttr);
   OSType* data = static_cast<OSType*>(attribute->data);
   *data = value;
 }
 
-void MockKeychain::SetTestDataPasswordBytes(int item, const void* data,
+void MockKeychain::SetTestDataPasswordBytes(MockKeychainItemType item,
+                                            const void* data,
                                             size_t length) {
   keychain_data_[item].length = length;
   if (length > 0) {
     if (keychain_data_[item].data)
       free(keychain_data_[item].data);
     keychain_data_[item].data = malloc(length);
     memcpy(keychain_data_[item].data, data, length);
   } else {
     keychain_data_[item].data = NULL;
   }
 }
 
-void MockKeychain::SetTestDataPasswordString(int item, const char* value) {
+void MockKeychain::SetTestDataPasswordString(
+    MockKeychainItemType item,
+    const char* value) {
   SetTestDataPasswordBytes(item, value, value ? strlen(value) : 0);
 }
 
 OSStatus MockKeychain::ItemCopyAttributesAndData(
     SecKeychainItemRef itemRef,
     SecKeychainAttributeInfo* info,
     SecItemClass* itemClass,
     SecKeychainAttributeList** attrList,
     UInt32* length,
     void** outData) const {
   DCHECK(itemRef);
-  unsigned int key = reinterpret_cast<unsigned int>(itemRef) - 1;
+  MockKeychainItemType key =
+    reinterpret_cast<MockKeychainItemType>(itemRef) - 1;

[Mark Mentovai, 2012/07/24 13:31:13]

Continuation lines are indented by 4 spaces, not 2. Compare with lines 142 and
281. Also fix lines 222 and 251.

   if (keychain_attr_list_.find(key) == keychain_attr_list_.end())
     return errSecInvalidItemRef;
 
   DCHECK(!itemClass);  // itemClass not implemented in the Mock.
   if (attrList)
     *attrList  = &(keychain_attr_list_[key]);
   if (outData) {
     *outData = keychain_data_[key].data;
     DCHECK(length);
     *length = keychain_data_[key].length;
   }
 
   ++attribute_data_copy_count_;
   return noErr;
 }
 
 OSStatus MockKeychain::ItemModifyAttributesAndData(
     SecKeychainItemRef itemRef,
     const SecKeychainAttributeList* attrList,
     UInt32 length,
     const void* data) const {
   DCHECK(itemRef);
   const char* fail_trigger = "fail_me";
   if (length == strlen(fail_trigger) &&
       memcmp(data, fail_trigger, length) == 0) {
     return errSecAuthFailed;
   }
 
-  unsigned int key = reinterpret_cast<unsigned int>(itemRef) - 1;
+  MockKeychainItemType key =
+    reinterpret_cast<MockKeychainItemType>(itemRef) - 1;
   if (keychain_attr_list_.find(key) == keychain_attr_list_.end())
     return errSecInvalidItemRef;
 
   MockKeychain* mutable_this = const_cast<MockKeychain*>(this);
   if (attrList) {
     for (UInt32 change_attr = 0; change_attr < attrList->count; ++change_attr) {
       if (attrList->attr[change_attr].tag == kSecCreatorItemAttr) {
         void* data = attrList->attr[change_attr].data;
         mutable_this->SetTestDataCreator(key, *(static_cast<OSType*>(data)));
       } else {
         NOTIMPLEMENTED();
       }
     }
   }
   if (data)
     mutable_this->SetTestDataPasswordBytes(key, data, length);
   return noErr;
 }
 
 OSStatus MockKeychain::ItemFreeAttributesAndData(
     SecKeychainAttributeList* attrList,
     void* data) const {
   --attribute_data_copy_count_;
   return noErr;
 }
 
 OSStatus MockKeychain::ItemDelete(SecKeychainItemRef itemRef) const {
-  unsigned int key = reinterpret_cast<unsigned int>(itemRef) - 1;
+  MockKeychainItemType key =
+    reinterpret_cast<MockKeychainItemType>(itemRef) - 1;
 
   for (unsigned int i = 0; i < keychain_attr_list_[key].count; ++i) {
     if (keychain_attr_list_[key].attr[i].data)
       free(keychain_attr_list_[key].attr[i].data);
   }
   free(keychain_attr_list_[key].attr);
   if (keychain_data_[key].data)
     free(keychain_data_[key].data);
 
   keychain_attr_list_.erase(key);
   keychain_data_.erase(key);
   added_via_api_.erase(key);
   return noErr;
 }
 
 OSStatus MockKeychain::SearchCreateFromAttributes(
     CFTypeRef keychainOrArray,
     SecItemClass itemClass,
     const SecKeychainAttributeList* attrList,
     SecKeychainSearchRef* searchRef) const {
   // Figure out which of our mock items matches, and set up the array we'll use
   // to generate results out of SearchCopyNext.
   remaining_search_results_.clear();
-  for (std::map<unsigned int, SecKeychainAttributeList>::const_iterator it =
-       keychain_attr_list_.begin(); it != keychain_attr_list_.end(); ++it) {
+  for (std::map<MockKeychainItemType, SecKeychainAttributeList>
+       ::const_iterator it = keychain_attr_list_.begin();

[Mark Mentovai, 2012/07/24 13:31:13]

You’ve done inconsistent things with rewrapping these long lines in for loop
initializations. You seem to have preferred to break at the ::, but in this case
and on line 312, you put the :: on the second line, and on line 524, you put it
on the first line. You should be consistent. My preference is for the :: to come
on the first line, although in this case, it seems that you have enough
horizontal space to break at the space after const_iterator.

When a for construct grows unwieldy like this one has, it’s important to help
readers spot each statement. That usually means giving each one its own line. It
also means that if a statement eats up more than one line, you should treat
subsequent lines as continuations.

  for (std::map<MockKeychainItemType, SecKeychainAttributeList>::const_iterator
           it = keychain_attr_list_.begin();
       it != keychain_attr_list_.end();
       ++it) {

Don’t worry about using four lines instead of three. It’s more readable now.

As mentioned, the for constructs around lines 312 and 524 need revision too.

+       it != keychain_attr_list_.end(); ++it) {
     bool mock_item_matches = true;
     for (UInt32 search_attr = 0; search_attr < attrList->count; ++search_attr) {
       SecKeychainAttribute* mock_attribute =
           AttributeWithTag(it->second, attrList->attr[search_attr].tag);
       if (mock_attribute->length != attrList->attr[search_attr].length ||
           memcmp(mock_attribute->data, attrList->attr[search_attr].data,
                  attrList->attr[search_attr].length) != 0) {
         mock_item_matches = false;
         break;
       }
     }
     if (mock_item_matches)
       remaining_search_results_.push_back(it->first);
   }
 
   DCHECK(searchRef);
-  *searchRef = reinterpret_cast<SecKeychainSearchRef>(kDummySearchRef);
+  *searchRef = kDummySearchRef;
   ++search_copy_count_;
   return noErr;
 }
 
 bool MockKeychain::AlreadyContainsInternetPassword(
     UInt32 serverNameLength,
     const char* serverName,
     UInt32 securityDomainLength,
     const char* securityDomain,
     UInt32 accountNameLength,
     const char* accountName,
     UInt32 pathLength,
     const char* path,
     UInt16 port,
     SecProtocolType protocol,
     SecAuthenticationType authenticationType) const {
-  for (std::map<unsigned int, SecKeychainAttributeList>::const_iterator it =
-       keychain_attr_list_.begin(); it != keychain_attr_list_.end(); ++it) {
+  for (std::map<MockKeychainItemType, SecKeychainAttributeList>
+       ::const_iterator it = keychain_attr_list_.begin();
+       it != keychain_attr_list_.end(); ++it) {
     SecKeychainAttribute* attribute;
     attribute = AttributeWithTag(it->second, kSecServerItemAttr);
     if ((attribute->length != serverNameLength) ||
         (attribute->data == NULL && *serverName != '\0') ||
         (attribute->data != NULL && *serverName == '\0') ||
         strncmp(serverName,
                 (const char*) attribute->data,
                 serverNameLength) != 0) {
       continue;
     }
@@ skipping 72 matching lines @@
   if (AlreadyContainsInternetPassword(serverNameLength, serverName,
                                       securityDomainLength, securityDomain,
                                       accountNameLength, accountName,
                                       pathLength, path,
                                       port, protocol,
                                       authenticationType)) {
     return errSecDuplicateItem;
   }
 
   // Pick the next unused slot.
-  unsigned int key = next_item_key_++;
+  MockKeychainItemType key = next_item_key_++;
 
   // Initialize keychain data storage at the target location.
   InitializeKeychainData(key);
 
   MockKeychain* mutable_this = const_cast<MockKeychain*>(this);
   mutable_this->SetTestDataBytes(key, kSecServerItemAttr, serverName,
                                  serverNameLength);
   mutable_this->SetTestDataBytes(key, kSecSecurityDomainItemAttr,
                                  securityDomain, securityDomainLength);
   mutable_this->SetTestDataBytes(key, kSecAccountItemAttr, accountName,
@@ skipping 18 matching lines @@
     *itemRef = reinterpret_cast<SecKeychainItemRef>(key + 1);
     ++keychain_item_copy_count_;
   }
   return noErr;
 }
 
 OSStatus MockKeychain::SearchCopyNext(SecKeychainSearchRef searchRef,
                                       SecKeychainItemRef* itemRef) const {
   if (remaining_search_results_.empty())
     return errSecItemNotFound;
-  unsigned int key = remaining_search_results_.front();
+  MockKeychainItemType key = remaining_search_results_.front();
   remaining_search_results_.erase(remaining_search_results_.begin());
   *itemRef = reinterpret_cast<SecKeychainItemRef>(key + 1);
   ++keychain_item_copy_count_;
   return noErr;
 }
 
 OSStatus MockKeychain::FindGenericPassword(CFTypeRef keychainOrArray,
                                            UInt32 serviceNameLength,
                                            const char* serviceName,
                                            UInt32 accountNameLength,
@@ skipping 38 matching lines @@
   add_generic_password_ =
       std::string(const_cast<char*>(static_cast<const char*>(passwordData)),
                   passwordLength);
   return noErr;
 }
 
 void MockKeychain::Free(CFTypeRef ref) const {
   if (!ref)
     return;
 
-  if (reinterpret_cast<int>(ref) == kDummySearchRef) {
+  if (ref == kDummySearchRef) {
     --search_copy_count_;
   } else {
     --keychain_item_copy_count_;
   }
 }
 
 int MockKeychain::UnfreedSearchCount() const {
   return search_copy_count_;
 }
 
 int MockKeychain::UnfreedKeychainItemCount() const {
   return keychain_item_copy_count_;
 }
 
 int MockKeychain::UnfreedAttributeDataCount() const {
   return attribute_data_copy_count_;
 }
 
 bool MockKeychain::CreatorCodesSetForAddedItems() const {
-  for (std::set<unsigned int>::const_iterator i = added_via_api_.begin();
+  for (std::set<MockKeychainItemType>::
+       const_iterator i = added_via_api_.begin();
        i != added_via_api_.end(); ++i) {
     SecKeychainAttribute* attribute = AttributeWithTag(keychain_attr_list_[*i],
                                                        kSecCreatorItemAttr);
     OSType* data = static_cast<OSType*>(attribute->data);
     if (*data == 0)
       return false;
   }
   return true;
 }
 
 void MockKeychain::AddTestItem(const KeychainTestData& item_data) {
-  unsigned int key = next_item_key_++;
+  MockKeychainItemType key = next_item_key_++;
 
   InitializeKeychainData(key);
   SetTestDataAuthType(key, item_data.auth_type);
   SetTestDataString(key, kSecServerItemAttr, item_data.server);
   SetTestDataProtocol(key, item_data.protocol);
   SetTestDataString(key, kSecPathItemAttr, item_data.path);
   SetTestDataPort(key, item_data.port);
   SetTestDataString(key, kSecSecurityDomainItemAttr,
                     item_data.security_domain);
   SetTestDataString(key, kSecCreationDateItemAttr, item_data.creation_date);
   SetTestDataString(key, kSecAccountItemAttr, item_data.username);
   SetTestDataPasswordString(key, item_data.password);
   SetTestDataNegativeItem(key, item_data.negative_item);
 }
 
-} // namespace crypto
+}  // namespace crypto