[dev.boringcrypto] all: merge master into dev.boringcrypto

Change-Id: If37221a68951890d817a85b68bd4a35903a36ceb

diff --cc src/crypto/tls/cipher_suites.go
Simple merge

diff --cc src/crypto/tls/common.go
Simple merge

diff --cc src/crypto/tls/handshake_client.go
index 995fd0c5b6d7fd1c0370d2abd66be068fd13d45e,076a525bf8936a46b8b17e763d092dec50c4df9e..08682c740155ffdde4eb7d908fceab6bf329f73f
--- 1/src/crypto/tls/handshake_client.go
--- 2/src/crypto/tls/handshake_client.go
+++ b/src/crypto/tls/handshake_client.go
@@@ -99,13 -113,25 +113,28 @@@ NextCipherSuite
        }
  
        if hello.vers >= VersionTLS12 {
 -              hello.supportedSignatureAlgorithms = supportedSignatureAlgorithms
 +              hello.supportedSignatureAlgorithms = supportedSignatureAlgorithms()
 +      }
 +      if testingOnlyForceClientHelloSignatureAlgorithms != nil {
 +              hello.supportedSignatureAlgorithms = testingOnlyForceClientHelloSignatureAlgorithms
        }
  
-       return hello, nil
+       var params ecdheParameters
+       if hello.supportedVersions[0] == VersionTLS13 {
+               hello.cipherSuites = append(hello.cipherSuites, defaultCipherSuitesTLS13()...)
+ 
+               curveID := config.curvePreferences()[0]
+               if _, ok := curveForCurveID(curveID); curveID != X25519 && !ok {
+                       return nil, nil, errors.New("tls: CurvePreferences includes unsupported curve")
+               }
+               params, err = generateECDHEParameters(config.rand(), curveID)
+               if err != nil {
+                       return nil, nil, err
+               }
+               hello.keyShares = []keyShare{{group: curveID, data: params.PublicKey()}}
+       }
+ 
+       return hello, params, nil
  }
  
  func (c *Conn) clientHandshake() error {
@@@ -736,6 -727,61 +730,63 @@@ func (hs *clientHandshakeState) sendFin
        return nil
  }
  
+ // verifyServerCertificate parses and verifies the provided chain, setting
+ // c.verifiedChains and c.peerCertificates or sending the appropriate alert.
+ func (c *Conn) verifyServerCertificate(certificates [][]byte) error {
+       certs := make([]*x509.Certificate, len(certificates))
+       for i, asn1Data := range certificates {
+               cert, err := x509.ParseCertificate(asn1Data)
+               if err != nil {
+                       c.sendAlert(alertBadCertificate)
+                       return errors.New("tls: failed to parse certificate from server: " + err.Error())
+               }
+               certs[i] = cert
+       }
+ 
+       if !c.config.InsecureSkipVerify {
+               opts := x509.VerifyOptions{
++                      IsBoring: isBoringCertificate,
++
+                       Roots:         c.config.RootCAs,
+                       CurrentTime:   c.config.time(),
+                       DNSName:       c.config.ServerName,
+                       Intermediates: x509.NewCertPool(),
+               }
+ 
+               for i, cert := range certs {
+                       if i == 0 {
+                               continue
+                       }
+                       opts.Intermediates.AddCert(cert)
+               }
+               var err error
+               c.verifiedChains, err = certs[0].Verify(opts)
+               if err != nil {
+                       c.sendAlert(alertBadCertificate)
+                       return err
+               }
+       }
+ 
+       if c.config.VerifyPeerCertificate != nil {
+               if err := c.config.VerifyPeerCertificate(certificates, c.verifiedChains); err != nil {
+                       c.sendAlert(alertBadCertificate)
+                       return err
+               }
+       }
+ 
+       switch certs[0].PublicKey.(type) {
+       case *rsa.PublicKey, *ecdsa.PublicKey:
+               break
+       default:
+               c.sendAlert(alertUnsupportedCertificate)
+               return fmt.Errorf("tls: server's certificate contains an unsupported type of public key: %T", certs[0].PublicKey)
+       }
+ 
+       c.peerCertificates = certs
+ 
+       return nil
+ }
+ 
  // tls11SignatureSchemes contains the signature schemes that we synthesise for
  // a TLS <= 1.1 connection, based on the supported certificate types.
  var tls11SignatureSchemes = []SignatureScheme{ECDSAWithP256AndSHA256, ECDSAWithP384AndSHA384, ECDSAWithP521AndSHA512, PKCS1WithSHA256, PKCS1WithSHA384, PKCS1WithSHA512, PKCS1WithSHA1}

diff --cc src/crypto/tls/key_agreement.go
Simple merge