git cl format the first third of the net/base directory

net/base/keygen_handler_mac.cc

Index: net/base/keygen_handler_mac.cc
diff --git a/net/base/keygen_handler_mac.cc b/net/base/keygen_handler_mac.cc
index 63ea84751aa1d926cc7fb215edf03d5431567204..25fec167f14ed2b6c11a5396548bc439f974f411 100644
--- a/net/base/keygen_handler_mac.cc
+++ b/net/base/keygen_handler_mac.cc
@@ -34,30 +34,17 @@ struct PublicKeyAndChallenge {
 // This is a copy of the built-in kSecAsn1IA5StringTemplate, but without the
 // 'streamable' flag, which was causing bogus data to be written.
 const SecAsn1Template kIA5StringTemplate[] = {
-    { SEC_ASN1_IA5_STRING, 0, NULL, sizeof(CSSM_DATA) }
-};
+    {SEC_ASN1_IA5_STRING, 0, NULL, sizeof(CSSM_DATA)}};
 
 static const SecAsn1Template kPublicKeyAndChallengeTemplate[] = {
-  {
-    SEC_ASN1_SEQUENCE,
-    0,
-    NULL,
-    sizeof(PublicKeyAndChallenge)
-  },
-  {
-    SEC_ASN1_INLINE,
-    offsetof(PublicKeyAndChallenge, spki),
-    kSecAsn1SubjectPublicKeyInfoTemplate
-  },
-  {
-    SEC_ASN1_INLINE,
-    offsetof(PublicKeyAndChallenge, challenge_string),
-    kIA5StringTemplate
-  },
-  {
-    0
-  }
-};
+    {SEC_ASN1_SEQUENCE, 0, NULL, sizeof(PublicKeyAndChallenge)},
+    {SEC_ASN1_INLINE,
+     offsetof(PublicKeyAndChallenge, spki),
+     kSecAsn1SubjectPublicKeyInfoTemplate},
+    {SEC_ASN1_INLINE,
+     offsetof(PublicKeyAndChallenge, challenge_string),
+     kIA5StringTemplate},
+    {0}};

[mmenke, 2014/12/02 19:22:29]

This is sufficiently different that we may want to standardize on including a
bonus comma at the end of array initializer lists, though it doesn't work for
struct initializer lists, I assume.

 
 struct SignedPublicKeyAndChallenge {
   PublicKeyAndChallenge pkac;
@@ -66,31 +53,15 @@ struct SignedPublicKeyAndChallenge {
 };
 
 static const SecAsn1Template kSignedPublicKeyAndChallengeTemplate[] = {
-  {
-    SEC_ASN1_SEQUENCE,
-    0,
-    NULL,
-    sizeof(SignedPublicKeyAndChallenge)
-  },
-  {
-    SEC_ASN1_INLINE,
-    offsetof(SignedPublicKeyAndChallenge, pkac),
-    kPublicKeyAndChallengeTemplate
-  },
-  {
-    SEC_ASN1_INLINE,
-    offsetof(SignedPublicKeyAndChallenge, signature_algorithm),
-    kSecAsn1AlgorithmIDTemplate
-  },
-  {
-    SEC_ASN1_BIT_STRING,
-    offsetof(SignedPublicKeyAndChallenge, signature)
-  },
-  {
-    0
-  }
-};
-
+    {SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SignedPublicKeyAndChallenge)},
+    {SEC_ASN1_INLINE,
+     offsetof(SignedPublicKeyAndChallenge, pkac),
+     kPublicKeyAndChallengeTemplate},
+    {SEC_ASN1_INLINE,
+     offsetof(SignedPublicKeyAndChallenge, signature_algorithm),
+     kSecAsn1AlgorithmIDTemplate},
+    {SEC_ASN1_BIT_STRING, offsetof(SignedPublicKeyAndChallenge, signature)},
+    {0}};
 
 static OSStatus CreateRSAKeyPair(int size_in_bits,
                                  SecAccessRef initial_access,
@@ -126,15 +97,15 @@ std::string KeygenHandler::GenKeyAndSignChallenge() {
     }
 
     // Create the key-pair.
-    err = CreateRSAKeyPair(key_size_in_bits_, initial_access,
-                           &public_key, &private_key);
+    err = CreateRSAKeyPair(key_size_in_bits_, initial_access, &public_key,
+                           &private_key);
     if (err)
       goto failure;
 
     // Get the public key data (DER sequence of modulus, exponent).
     CFDataRef key_data = NULL;
-    err = SecKeychainItemExport(public_key, kSecFormatBSAFE, 0, NULL,
-                                &key_data);
+    err =
+        SecKeychainItemExport(public_key, kSecFormatBSAFE, 0, NULL, &key_data);
     if (err) {
       crypto::LogCSSMError("SecKeychainItemExpor", err);
       goto failure;
@@ -161,8 +132,8 @@ std::string KeygenHandler::GenKeyAndSignChallenge() {
         reinterpret_cast<uint8_t*>(const_cast<char*>(challenge_.data()));
 
     CSSM_DATA encoded;
-    err = SecAsn1EncodeItem(coder, &spkac.pkac,
-                            kPublicKeyAndChallengeTemplate, &encoded);
+    err = SecAsn1EncodeItem(coder, &spkac.pkac, kPublicKeyAndChallengeTemplate,
+                            &encoded);
     if (err) {
       crypto::LogCSSMError("SecAsn1EncodeItem", err);
       goto failure;
@@ -179,8 +150,8 @@ std::string KeygenHandler::GenKeyAndSignChallenge() {
     // See <https://bugzilla.mozilla.org/show_bug.cgi?id=549460>
 
     // DER-encode the entire SignedPublicKeyAndChallenge:
-    err = SecAsn1EncodeItem(coder, &spkac,
-                            kSignedPublicKeyAndChallengeTemplate, &encoded);
+    err = SecAsn1EncodeItem(coder, &spkac, kSignedPublicKeyAndChallengeTemplate,
+                            &encoded);
     if (err) {
       crypto::LogCSSMError("SecAsn1EncodeItem", err);
       goto failure;
@@ -191,7 +162,7 @@ std::string KeygenHandler::GenKeyAndSignChallenge() {
     base::Base64Encode(input, &result);
   }
 
- failure:
+failure:
   if (err)
     OSSTATUS_LOG(ERROR, err) << "SSL Keygen failed!";
   else
@@ -218,7 +189,6 @@ std::string KeygenHandler::GenKeyAndSignChallenge() {
   return result;
 }
 
-
 // Create an RSA key pair with size |size_in_bits|. |initial_access|
 // is passed as the initial access control list in Keychain. The
 // public and private keys are placed in |out_pub_key| and
@@ -238,10 +208,7 @@ static OSStatus CreateRSAKeyPair(int size_in_bits,
   {
     base::AutoLock locked(crypto::GetMacSecurityServicesLock());
     err = SecKeyCreatePair(
-        keychain,
-        CSSM_ALGID_RSA,
-        size_in_bits,
-        0LL,
+        keychain, CSSM_ALGID_RSA, size_in_bits, 0LL,
         // public key usage and attributes:
         CSSM_KEYUSE_ENCRYPT | CSSM_KEYUSE_VERIFY | CSSM_KEYUSE_WRAP,
         CSSM_KEYATTR_EXTRACTABLE | CSSM_KEYATTR_PERMANENT,
@@ -249,8 +216,7 @@ static OSStatus CreateRSAKeyPair(int size_in_bits,
         CSSM_KEYUSE_DECRYPT | CSSM_KEYUSE_SIGN | CSSM_KEYUSE_UNWRAP,
         CSSM_KEYATTR_EXTRACTABLE | CSSM_KEYATTR_PERMANENT |
             CSSM_KEYATTR_SENSITIVE,
-        initial_access,
-        out_pub_key, out_priv_key);
+        initial_access, out_pub_key, out_priv_key);
   }
   if (err)
     crypto::LogCSSMError("SecKeyCreatePair", err);
@@ -264,10 +230,8 @@ static OSStatus CreateSignatureContext(SecKeyRef key,
   const CSSM_ACCESS_CREDENTIALS* credentials = NULL;
   {
     base::AutoLock locked(crypto::GetMacSecurityServicesLock());
-    err = SecKeyGetCredentials(key,
-                               CSSM_ACL_AUTHORIZATION_SIGN,
-                               kSecCredentialTypeDefault,
-                               &credentials);
+    err = SecKeyGetCredentials(key, CSSM_ACL_AUTHORIZATION_SIGN,
+                               kSecCredentialTypeDefault, &credentials);
   }
   if (err) {
     crypto::LogCSSMError("SecKeyGetCredentials", err);
@@ -294,11 +258,8 @@ static OSStatus CreateSignatureContext(SecKeyRef key,
     return err;
   }
 
-  err = CSSM_CSP_CreateSignatureContext(csp_handle,
-                                        algorithm,
-                                        credentials,
-                                        cssm_key,
-                                        out_cc_handle);
+  err = CSSM_CSP_CreateSignatureContext(csp_handle, algorithm, credentials,
+                                        cssm_key, out_cc_handle);
   if (err)
     crypto::LogCSSMError("CSSM_CSP_CreateSignatureContext", err);
   return err;
@@ -308,9 +269,8 @@ static OSStatus SignData(CSSM_DATA data,
                          SecKeyRef private_key,
                          CSSM_DATA* signature) {
   CSSM_CC_HANDLE cc_handle;
-  OSStatus err = CreateSignatureContext(private_key,
-                                        CSSM_ALGID_MD5WithRSA,
-                                        &cc_handle);
+  OSStatus err =
+      CreateSignatureContext(private_key, CSSM_ALGID_MD5WithRSA, &cc_handle);
   if (err) {
     crypto::LogCSSMError("CreateSignatureContext", err);
     return err;