net: reenable Twitter's public key pins with api.twitter.com using the CDN pins.

net/base/public_key_hashes_check.go

 // 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.
 
 // public_key_hashes_check.go runs tests on public_key_hashes.h. It's not run
 // automatically, but rather as part of the process of manually updating
 // public_key_hashes.h
 //
 // It verifies that each hash in the file is correct given the preceeding
 // certificate and that the name of the variable matches the name given in the
@@ skipping 35 matching lines @@
 // the given CN.
 func matchNames(name, v string) error {
         words := strings.Split(name, " ")
         if len(words) == 0 {
                 return errors.New("No words in certificate name")
         }
         firstWord := words[0]
         if strings.HasSuffix(firstWord, ",") {
                 firstWord = firstWord[:len(firstWord)-1]
         }
+        if pos := strings.Index(firstWord, "."); pos != -1 {
+                firstWord = firstWord[:pos]
+        }
+        if pos := strings.Index(firstWord, "-"); pos != -1 {
+                firstWord = firstWord[:pos]
+        }
         if !strings.HasPrefix(v, firstWord) {
                 return errors.New("The first word of the certificate name isn't a prefix of the variable name")
         }
 
         for i, word := range words {
                 if word == "Class" && i+1 < len(words) {
                         if strings.Index(v, word+words[i+1]) == -1 {
                                 return errors.New("Class specification doesn't appear in the variable name")
                         }
                 } else if len(word) == 1 && word[0] >= '0' && word[0] <= '9' {
@@ skipping 62 matching lines @@
                         cert = append(cert, newLine...)
                 case POSTDECL:
                         trimmed := bytes.TrimSpace(line)
                         if len(trimmed) < 8 || !bytes.HasPrefix(trimmed, []byte("\"sha1/")) {
                                 fmt.Fprintf(os.Stderr, "Line %d is immediately after a declation, but failed to find a hash on it\n", lineNo)
                                 return
                         }
                         trimmed = trimmed[6 : len(trimmed)-2]
                         h := sha1.New()
                         h.Write(x509Cert.RawSubjectPublicKeyInfo)
-                        shouldBe := base64.StdEncoding.EncodeToString(h.Sum())
+                        shouldBe := base64.StdEncoding.EncodeToString(h.Sum(nil))
                         if shouldBe != string(trimmed) {
                                 fmt.Fprintf(os.Stderr, "Line %d: hash should be %s, but found %s\n", lineNo, shouldBe, trimmed)
                                 return
                         }
                         if _, ok := seenHashes[shouldBe]; ok {
                                 fmt.Fprintf(os.Stderr, "Line %d: duplicated hash\n", lineNo)
                                 return
                         }
                         seenHashes[shouldBe] = true
                         state = PRECERT
@@ skipping 71 matching lines @@
                                 state = POSTDECL
                         case POSTDECL:
                                 fmt.Fprintf(os.Stderr, "Found declation at line %d, but missed the hash value of the previous one\n", lineNo)
                                 return
                         default:
                                 panic("bad state")
                         }
                 }
         }
 }