mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
1) Change default gofmt default settings for
parsing and printing to new syntax.
Use -oldparser to parse the old syntax,
use -oldprinter to print the old syntax.
2) Change default gofmt formatting settings
to use tabs for indentation only and to use
spaces for alignment. This will make the code
alignment insensitive to an editor's tabwidth.
Use -spaces=false to use tabs for alignment.
3) Manually changed src/exp/parser/parser_test.go
so that it doesn't try to parse the parser's
source files using the old syntax (they have
new syntax now).
4) gofmt -w src misc test/bench
1st set of files.
R=rsc
CC=agl, golang-dev, iant, ken2, r
https://golang.org/cl/180047
This commit is contained in:
Robert Griesemer
parent
34356e9a6a
commit
5a1d3323fe
139 changed files with 9422 additions and 9422 deletions
|
|
@ -13,17 +13,17 @@ package tls
|
|||
// channel in the message (ChangeCipherSpec).
|
||||
|
||||
import (
|
||||
"crypto/hmac";
|
||||
"crypto/rc4";
|
||||
"crypto/rsa";
|
||||
"crypto/sha1";
|
||||
"crypto/subtle";
|
||||
"io";
|
||||
"crypto/hmac"
|
||||
"crypto/rc4"
|
||||
"crypto/rsa"
|
||||
"crypto/sha1"
|
||||
"crypto/subtle"
|
||||
"io"
|
||||
)
|
||||
|
||||
type cipherSuite struct {
|
||||
id uint16; // The number of this suite on the wire.
|
||||
hashLength, cipherKeyLength int;
|
||||
id uint16 // The number of this suite on the wire.
|
||||
hashLength, cipherKeyLength int
|
||||
// TODO(agl): need a method to create the cipher and hash interfaces.
|
||||
}
|
||||
|
||||
|
|
@ -33,118 +33,118 @@ var cipherSuites = []cipherSuite{
|
|||
|
||||
// A serverHandshake performs the server side of the TLS 1.1 handshake protocol.
|
||||
type serverHandshake struct {
|
||||
writeChan chan<- interface{};
|
||||
controlChan chan<- interface{};
|
||||
msgChan <-chan interface{};
|
||||
config *Config;
|
||||
writeChan chan<- interface{}
|
||||
controlChan chan<- interface{}
|
||||
msgChan <-chan interface{}
|
||||
config *Config
|
||||
}
|
||||
|
||||
func (h *serverHandshake) loop(writeChan chan<- interface{}, controlChan chan<- interface{}, msgChan <-chan interface{}, config *Config) {
|
||||
h.writeChan = writeChan;
|
||||
h.controlChan = controlChan;
|
||||
h.msgChan = msgChan;
|
||||
h.config = config;
|
||||
h.writeChan = writeChan
|
||||
h.controlChan = controlChan
|
||||
h.msgChan = msgChan
|
||||
h.config = config
|
||||
|
||||
defer close(writeChan);
|
||||
defer close(controlChan);
|
||||
defer close(writeChan)
|
||||
defer close(controlChan)
|
||||
|
||||
clientHello, ok := h.readHandshakeMsg().(*clientHelloMsg);
|
||||
clientHello, ok := h.readHandshakeMsg().(*clientHelloMsg)
|
||||
if !ok {
|
||||
h.error(alertUnexpectedMessage);
|
||||
return;
|
||||
h.error(alertUnexpectedMessage)
|
||||
return
|
||||
}
|
||||
major, minor, ok := mutualVersion(clientHello.major, clientHello.minor);
|
||||
major, minor, ok := mutualVersion(clientHello.major, clientHello.minor)
|
||||
if !ok {
|
||||
h.error(alertProtocolVersion);
|
||||
return;
|
||||
h.error(alertProtocolVersion)
|
||||
return
|
||||
}
|
||||
|
||||
finishedHash := newFinishedHash();
|
||||
finishedHash.Write(clientHello.marshal());
|
||||
finishedHash := newFinishedHash()
|
||||
finishedHash.Write(clientHello.marshal())
|
||||
|
||||
hello := new(serverHelloMsg);
|
||||
hello := new(serverHelloMsg)
|
||||
|
||||
// We only support a single ciphersuite so we look for it in the list
|
||||
// of client supported suites.
|
||||
//
|
||||
// TODO(agl): Add additional cipher suites.
|
||||
var suite *cipherSuite;
|
||||
var suite *cipherSuite
|
||||
|
||||
for _, id := range clientHello.cipherSuites {
|
||||
for _, supported := range cipherSuites {
|
||||
if supported.id == id {
|
||||
suite = &supported;
|
||||
break;
|
||||
suite = &supported
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
foundCompression := false;
|
||||
foundCompression := false
|
||||
// We only support null compression, so check that the client offered it.
|
||||
for _, compression := range clientHello.compressionMethods {
|
||||
if compression == compressionNone {
|
||||
foundCompression = true;
|
||||
break;
|
||||
foundCompression = true
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if suite == nil || !foundCompression {
|
||||
h.error(alertHandshakeFailure);
|
||||
return;
|
||||
h.error(alertHandshakeFailure)
|
||||
return
|
||||
}
|
||||
|
||||
hello.major = major;
|
||||
hello.minor = minor;
|
||||
hello.cipherSuite = suite.id;
|
||||
currentTime := uint32(config.Time());
|
||||
hello.random = make([]byte, 32);
|
||||
hello.random[0] = byte(currentTime >> 24);
|
||||
hello.random[1] = byte(currentTime >> 16);
|
||||
hello.random[2] = byte(currentTime >> 8);
|
||||
hello.random[3] = byte(currentTime);
|
||||
_, err := io.ReadFull(config.Rand, hello.random[4:]);
|
||||
hello.major = major
|
||||
hello.minor = minor
|
||||
hello.cipherSuite = suite.id
|
||||
currentTime := uint32(config.Time())
|
||||
hello.random = make([]byte, 32)
|
||||
hello.random[0] = byte(currentTime >> 24)
|
||||
hello.random[1] = byte(currentTime >> 16)
|
||||
hello.random[2] = byte(currentTime >> 8)
|
||||
hello.random[3] = byte(currentTime)
|
||||
_, err := io.ReadFull(config.Rand, hello.random[4:])
|
||||
if err != nil {
|
||||
h.error(alertInternalError);
|
||||
return;
|
||||
h.error(alertInternalError)
|
||||
return
|
||||
}
|
||||
hello.compressionMethod = compressionNone;
|
||||
hello.compressionMethod = compressionNone
|
||||
|
||||
finishedHash.Write(hello.marshal());
|
||||
writeChan <- writerSetVersion{major, minor};
|
||||
writeChan <- hello;
|
||||
finishedHash.Write(hello.marshal())
|
||||
writeChan <- writerSetVersion{major, minor}
|
||||
writeChan <- hello
|
||||
|
||||
if len(config.Certificates) == 0 {
|
||||
h.error(alertInternalError);
|
||||
return;
|
||||
h.error(alertInternalError)
|
||||
return
|
||||
}
|
||||
|
||||
certMsg := new(certificateMsg);
|
||||
certMsg.certificates = config.Certificates[0].Certificate;
|
||||
finishedHash.Write(certMsg.marshal());
|
||||
writeChan <- certMsg;
|
||||
certMsg := new(certificateMsg)
|
||||
certMsg.certificates = config.Certificates[0].Certificate
|
||||
finishedHash.Write(certMsg.marshal())
|
||||
writeChan <- certMsg
|
||||
|
||||
helloDone := new(serverHelloDoneMsg);
|
||||
finishedHash.Write(helloDone.marshal());
|
||||
writeChan <- helloDone;
|
||||
helloDone := new(serverHelloDoneMsg)
|
||||
finishedHash.Write(helloDone.marshal())
|
||||
writeChan <- helloDone
|
||||
|
||||
ckx, ok := h.readHandshakeMsg().(*clientKeyExchangeMsg);
|
||||
ckx, ok := h.readHandshakeMsg().(*clientKeyExchangeMsg)
|
||||
if !ok {
|
||||
h.error(alertUnexpectedMessage);
|
||||
return;
|
||||
h.error(alertUnexpectedMessage)
|
||||
return
|
||||
}
|
||||
finishedHash.Write(ckx.marshal());
|
||||
finishedHash.Write(ckx.marshal())
|
||||
|
||||
preMasterSecret := make([]byte, 48);
|
||||
_, err = io.ReadFull(config.Rand, preMasterSecret[2:]);
|
||||
preMasterSecret := make([]byte, 48)
|
||||
_, err = io.ReadFull(config.Rand, preMasterSecret[2:])
|
||||
if err != nil {
|
||||
h.error(alertInternalError);
|
||||
return;
|
||||
h.error(alertInternalError)
|
||||
return
|
||||
}
|
||||
|
||||
err = rsa.DecryptPKCS1v15SessionKey(config.Rand, config.Certificates[0].PrivateKey, ckx.ciphertext, preMasterSecret);
|
||||
err = rsa.DecryptPKCS1v15SessionKey(config.Rand, config.Certificates[0].PrivateKey, ckx.ciphertext, preMasterSecret)
|
||||
if err != nil {
|
||||
h.error(alertHandshakeFailure);
|
||||
return;
|
||||
h.error(alertHandshakeFailure)
|
||||
return
|
||||
}
|
||||
// We don't check the version number in the premaster secret. For one,
|
||||
// by checking it, we would leak information about the validity of the
|
||||
|
|
@ -154,70 +154,70 @@ func (h *serverHandshake) loop(writeChan chan<- interface{}, controlChan chan<-
|
|||
// 7.4.7.1 of RFC 4346.
|
||||
|
||||
masterSecret, clientMAC, serverMAC, clientKey, serverKey :=
|
||||
keysFromPreMasterSecret11(preMasterSecret, clientHello.random, hello.random, suite.hashLength, suite.cipherKeyLength);
|
||||
keysFromPreMasterSecret11(preMasterSecret, clientHello.random, hello.random, suite.hashLength, suite.cipherKeyLength)
|
||||
|
||||
_, ok = h.readHandshakeMsg().(changeCipherSpec);
|
||||
_, ok = h.readHandshakeMsg().(changeCipherSpec)
|
||||
if !ok {
|
||||
h.error(alertUnexpectedMessage);
|
||||
return;
|
||||
h.error(alertUnexpectedMessage)
|
||||
return
|
||||
}
|
||||
|
||||
cipher, _ := rc4.NewCipher(clientKey);
|
||||
controlChan <- &newCipherSpec{cipher, hmac.New(sha1.New(), clientMAC)};
|
||||
cipher, _ := rc4.NewCipher(clientKey)
|
||||
controlChan <- &newCipherSpec{cipher, hmac.New(sha1.New(), clientMAC)}
|
||||
|
||||
clientFinished, ok := h.readHandshakeMsg().(*finishedMsg);
|
||||
clientFinished, ok := h.readHandshakeMsg().(*finishedMsg)
|
||||
if !ok {
|
||||
h.error(alertUnexpectedMessage);
|
||||
return;
|
||||
h.error(alertUnexpectedMessage)
|
||||
return
|
||||
}
|
||||
|
||||
verify := finishedHash.clientSum(masterSecret);
|
||||
verify := finishedHash.clientSum(masterSecret)
|
||||
if len(verify) != len(clientFinished.verifyData) ||
|
||||
subtle.ConstantTimeCompare(verify, clientFinished.verifyData) != 1 {
|
||||
h.error(alertHandshakeFailure);
|
||||
return;
|
||||
h.error(alertHandshakeFailure)
|
||||
return
|
||||
}
|
||||
|
||||
controlChan <- ConnectionState{true, "TLS_RSA_WITH_RC4_128_SHA", 0};
|
||||
controlChan <- ConnectionState{true, "TLS_RSA_WITH_RC4_128_SHA", 0}
|
||||
|
||||
finishedHash.Write(clientFinished.marshal());
|
||||
finishedHash.Write(clientFinished.marshal())
|
||||
|
||||
cipher2, _ := rc4.NewCipher(serverKey);
|
||||
writeChan <- writerChangeCipherSpec{cipher2, hmac.New(sha1.New(), serverMAC)};
|
||||
cipher2, _ := rc4.NewCipher(serverKey)
|
||||
writeChan <- writerChangeCipherSpec{cipher2, hmac.New(sha1.New(), serverMAC)}
|
||||
|
||||
finished := new(finishedMsg);
|
||||
finished.verifyData = finishedHash.serverSum(masterSecret);
|
||||
writeChan <- finished;
|
||||
finished := new(finishedMsg)
|
||||
finished.verifyData = finishedHash.serverSum(masterSecret)
|
||||
writeChan <- finished
|
||||
|
||||
writeChan <- writerEnableApplicationData{};
|
||||
writeChan <- writerEnableApplicationData{}
|
||||
|
||||
for {
|
||||
_, ok := h.readHandshakeMsg().(*clientHelloMsg);
|
||||
_, ok := h.readHandshakeMsg().(*clientHelloMsg)
|
||||
if !ok {
|
||||
h.error(alertUnexpectedMessage);
|
||||
return;
|
||||
h.error(alertUnexpectedMessage)
|
||||
return
|
||||
}
|
||||
// We reject all renegotication requests.
|
||||
writeChan <- alert{alertLevelWarning, alertNoRenegotiation};
|
||||
writeChan <- alert{alertLevelWarning, alertNoRenegotiation}
|
||||
}
|
||||
}
|
||||
|
||||
func (h *serverHandshake) readHandshakeMsg() interface{} {
|
||||
v := <-h.msgChan;
|
||||
v := <-h.msgChan
|
||||
if closed(h.msgChan) {
|
||||
// If the channel closed then the processor received an error
|
||||
// from the peer and we don't want to echo it back to them.
|
||||
h.msgChan = nil;
|
||||
return 0;
|
||||
h.msgChan = nil
|
||||
return 0
|
||||
}
|
||||
if _, ok := v.(alert); ok {
|
||||
// We got an alert from the processor. We forward to the writer
|
||||
// and shutdown.
|
||||
h.writeChan <- v;
|
||||
h.msgChan = nil;
|
||||
return 0;
|
||||
h.writeChan <- v
|
||||
h.msgChan = nil
|
||||
return 0
|
||||
}
|
||||
return v;
|
||||
return v
|
||||
}
|
||||
|
||||
func (h *serverHandshake) error(e alertType) {
|
||||
|
|
@ -227,9 +227,9 @@ func (h *serverHandshake) error(e alertType) {
|
|||
go func() {
|
||||
for _ = range h.msgChan {
|
||||
}
|
||||
}();
|
||||
h.controlChan <- ConnectionState{false, "", e};
|
||||
close(h.controlChan);
|
||||
h.writeChan <- alert{alertLevelError, e};
|
||||
}()
|
||||
h.controlChan <- ConnectionState{false, "", e}
|
||||
close(h.controlChan)
|
||||
h.writeChan <- alert{alertLevelError, e}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue