kris/th5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- replaced gofmt expression formatting algorithm with

Browse Source 
rsc's algorithm
	- applied gofmt -w misc src
	- partial CL (remaining files in other CLs)

R=rsc, r
http://go/go-review/1026036
This commit is contained in:
Robert Griesemer 2009-11-09 21:13:17 -08:00
parent 395b73f134
commit d1f931a694
6 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.go
View File

@ -14,7 +14,7 @@ const (
// maxTLSCiphertext is the maximum length of a plaintext payload. // maxTLSCiphertext is the maximum length of a plaintext payload.
maxTLSPlaintext = 16384; maxTLSPlaintext = 16384;
// maxTLSCiphertext is the maximum length payload after compression and encryption. // maxTLSCiphertext is the maximum length payload after compression and encryption.
maxTLSCiphertext = 16384+2048; maxTLSCiphertext = 16384 + 2048;
// maxHandshakeMsg is the largest single handshake message that we'll buffer. // maxHandshakeMsg is the largest single handshake message that we'll buffer.
maxHandshakeMsg = 65536; maxHandshakeMsg = 65536;
) )

60
handshake_messages.go
View File

@ -25,22 +25,22 @@ func (m *clientHelloMsg) marshal() []byte {
length := 2 + 32 + 1 + len(m.sessionId) + 2 + len(m.cipherSuites)*2 + 1 + len(m.compressionMethods); length := 2 + 32 + 1 + len(m.sessionId) + 2 + len(m.cipherSuites)*2 + 1 + len(m.compressionMethods);
x := make([]byte, 4+length); x := make([]byte, 4+length);
x[0] = typeClientHello; x[0] = typeClientHello;
x[1] = uint8(length>>16); x[1] = uint8(length >> 16);
x[2] = uint8(length>>8); x[2] = uint8(length >> 8);
x[3] = uint8(length); x[3] = uint8(length);
x[4] = m.major; x[4] = m.major;
x[5] = m.minor; x[5] = m.minor;
bytes.Copy(x[6:38], m.random); bytes.Copy(x[6:38], m.random);
x[38] = uint8(len(m.sessionId)); x[38] = uint8(len(m.sessionId));
bytes.Copy(x[39 : 39+len(m.sessionId)], m.sessionId); bytes.Copy(x[39:39+len(m.sessionId)], m.sessionId);
y := x[39+len(m.sessionId) : len(x)]; y := x[39+len(m.sessionId) : len(x)];
y[0] = uint8(len(m.cipherSuites)>>7); y[0] = uint8(len(m.cipherSuites) >> 7);
y[1] = uint8(len(m.cipherSuites)<<1); y[1] = uint8(len(m.cipherSuites) << 1);
for i, suite := range m.cipherSuites { for i, suite := range m.cipherSuites {
y[2 + i*2] = uint8(suite>>8); y[2+i*2] = uint8(suite >> 8);
y[3 + i*2] = uint8(suite); y[3+i*2] = uint8(suite);
} }
z := y[2 + len(m.cipherSuites)*2 : len(y)]; z := y[2+len(m.cipherSuites)*2 : len(y)];
z[0] = uint8(len(m.compressionMethods)); z[0] = uint8(len(m.compressionMethods));
bytes.Copy(z[1:len(z)], m.compressionMethods); bytes.Copy(z[1:len(z)], m.compressionMethods);
m.raw = x; m.raw = x;
@ -57,34 +57,34 @@ func (m *clientHelloMsg) unmarshal(data []byte) bool {
m.minor = data[5]; m.minor = data[5];
m.random = data[6:38]; m.random = data[6:38];
sessionIdLen := int(data[38]); sessionIdLen := int(data[38]);
if sessionIdLen > 32 || len(data) < 39 + sessionIdLen { if sessionIdLen > 32 || len(data) < 39+sessionIdLen {
return false return false
} }
m.sessionId = data[39 : 39 + sessionIdLen]; m.sessionId = data[39 : 39+sessionIdLen];
data = data[39 + sessionIdLen : len(data)]; data = data[39+sessionIdLen : len(data)];
if len(data) < 2 { if len(data) < 2 {
return false return false
} }
// cipherSuiteLen is the number of bytes of cipher suite numbers. Since // cipherSuiteLen is the number of bytes of cipher suite numbers. Since
// they are uint16s, the number must be even. // they are uint16s, the number must be even.
cipherSuiteLen := int(data[0])<<8 | int(data[1]); cipherSuiteLen := int(data[0])<<8 | int(data[1]);
if cipherSuiteLen % 2 == 1 || len(data) < 2 + cipherSuiteLen { if cipherSuiteLen%2 == 1 || len(data) < 2+cipherSuiteLen {
return false return false
} }
numCipherSuites := cipherSuiteLen / 2; numCipherSuites := cipherSuiteLen / 2;
m.cipherSuites = make([]uint16, numCipherSuites); m.cipherSuites = make([]uint16, numCipherSuites);
for i := 0; i < numCipherSuites; i++ { for i := 0; i < numCipherSuites; i++ {
m.cipherSuites[i] = uint16(data[2 + 2*i])<<8 | uint16(data[3 + 2*i]) m.cipherSuites[i] = uint16(data[2+2*i])<<8 | uint16(data[3+2*i])
} }
data = data[2 + cipherSuiteLen : len(data)]; data = data[2+cipherSuiteLen : len(data)];
if len(data) < 2 { if len(data) < 2 {
return false return false
} }
compressionMethodsLen := int(data[0]); compressionMethodsLen := int(data[0]);
if len(data) < 1 + compressionMethodsLen { if len(data) < 1+compressionMethodsLen {
return false return false
} }
m.compressionMethods = data[1 : 1 + compressionMethodsLen]; m.compressionMethods = data[1 : 1+compressionMethodsLen];
// A ClientHello may be following by trailing data: RFC 4346 section 7.4.1.2 // A ClientHello may be following by trailing data: RFC 4346 section 7.4.1.2
return true; return true;
@ -104,17 +104,17 @@ func (m *serverHelloMsg) marshal() []byte {
return m.raw return m.raw
} }
length := 38+len(m.sessionId); length := 38 + len(m.sessionId);
x := make([]byte, 4+length); x := make([]byte, 4+length);
x[0] = typeServerHello; x[0] = typeServerHello;
x[1] = uint8(length>>16); x[1] = uint8(length >> 16);
x[2] = uint8(length>>8); x[2] = uint8(length >> 8);
x[3] = uint8(length); x[3] = uint8(length);
x[4] = m.major; x[4] = m.major;
x[5] = m.minor; x[5] = m.minor;
bytes.Copy(x[6:38], m.random); bytes.Copy(x[6:38], m.random);
x[38] = uint8(len(m.sessionId)); x[38] = uint8(len(m.sessionId));
bytes.Copy(x[39 : 39+len(m.sessionId)], m.sessionId); bytes.Copy(x[39:39+len(m.sessionId)], m.sessionId);
z := x[39+len(m.sessionId) : len(x)]; z := x[39+len(m.sessionId) : len(x)];
z[0] = uint8(m.cipherSuite >> 8); z[0] = uint8(m.cipherSuite >> 8);
z[1] = uint8(m.cipherSuite); z[1] = uint8(m.cipherSuite);
@ -142,19 +142,19 @@ func (m *certificateMsg) marshal() (x []byte) {
length := 3 + 3*len(m.certificates) + i; length := 3 + 3*len(m.certificates) + i;
x = make([]byte, 4+length); x = make([]byte, 4+length);
x[0] = typeCertificate; x[0] = typeCertificate;
x[1] = uint8(length>>16); x[1] = uint8(length >> 16);
x[2] = uint8(length>>8); x[2] = uint8(length >> 8);
x[3] = uint8(length); x[3] = uint8(length);
certificateOctets := length-3; certificateOctets := length - 3;
x[4] = uint8(certificateOctets >> 16); x[4] = uint8(certificateOctets >> 16);
x[5] = uint8(certificateOctets >> 8); x[5] = uint8(certificateOctets >> 8);
x[6] = uint8(certificateOctets); x[6] = uint8(certificateOctets);
y := x[7:len(x)]; y := x[7:len(x)];
for _, slice := range m.certificates { for _, slice := range m.certificates {
y[0] = uint8(len(slice)>>16); y[0] = uint8(len(slice) >> 16);
y[1] = uint8(len(slice)>>8); y[1] = uint8(len(slice) >> 8);
y[2] = uint8(len(slice)); y[2] = uint8(len(slice));
bytes.Copy(y[3:len(y)], slice); bytes.Copy(y[3:len(y)], slice);
y = y[3+len(slice) : len(y)]; y = y[3+len(slice) : len(y)];
@ -181,13 +181,13 @@ func (m *clientKeyExchangeMsg) marshal() []byte {
if m.raw != nil { if m.raw != nil {
return m.raw return m.raw
} }
length := len(m.ciphertext)+2; length := len(m.ciphertext) + 2;
x := make([]byte, length+4); x := make([]byte, length+4);
x[0] = typeClientKeyExchange; x[0] = typeClientKeyExchange;
x[1] = uint8(length>>16); x[1] = uint8(length >> 16);
x[2] = uint8(length>>8); x[2] = uint8(length >> 8);
x[3] = uint8(length); x[3] = uint8(length);
x[4] = uint8(len(m.ciphertext)>>8); x[4] = uint8(len(m.ciphertext) >> 8);
x[5] = uint8(len(m.ciphertext)); x[5] = uint8(len(m.ciphertext));
bytes.Copy(x[6:len(x)], m.ciphertext); bytes.Copy(x[6:len(x)], m.ciphertext);
@ -201,7 +201,7 @@ func (m *clientKeyExchangeMsg) unmarshal(data []byte) bool {
return false return false
} }
cipherTextLen := int(data[4])<<8 | int(data[5]); cipherTextLen := int(data[4])<<8 | int(data[5]);
if len(data) != 6 + cipherTextLen { if len(data) != 6+cipherTextLen {
return false return false
} }
m.ciphertext = data[6:len(data)]; m.ciphertext = data[6:len(data)];

4
handshake_messages_test.go
View File

@ -73,11 +73,11 @@ func (*clientHelloMsg) Generate(rand *rand.Rand, size int) reflect.Value {
m.minor = uint8(rand.Intn(256)); m.minor = uint8(rand.Intn(256));
m.random = randomBytes(32, rand); m.random = randomBytes(32, rand);
m.sessionId = randomBytes(rand.Intn(32), rand); m.sessionId = randomBytes(rand.Intn(32), rand);
m.cipherSuites = make([]uint16, rand.Intn(63) + 1); m.cipherSuites = make([]uint16, rand.Intn(63)+1);
for i := 0; i < len(m.cipherSuites); i++ { for i := 0; i < len(m.cipherSuites); i++ {
m.cipherSuites[i] = uint16(rand.Int31()) m.cipherSuites[i] = uint16(rand.Int31())
} }
m.compressionMethods = randomBytes(rand.Intn(63) + 1, rand); m.compressionMethods = randomBytes(rand.Intn(63)+1, rand);
return reflect.NewValue(m); return reflect.NewValue(m);
} }

8
prf.go
View File

@ -35,9 +35,9 @@ func pHash(result, secret, seed []byte, hash hash.Hash) {
b := h.Sum(); b := h.Sum();
todo := len(b); todo := len(b);
if j+todo > len(result) { if j+todo > len(result) {
todo = len(result)-j todo = len(result) - j
} }
bytes.Copy(result[j : j+todo], b); bytes.Copy(result[j:j+todo], b);
j += todo; j += todo;
h.Reset(); h.Reset();
@ -94,8 +94,8 @@ func keysFromPreMasterSecret11(preMasterSecret, clientRandom, serverRandom []byt
pRF11(keyMaterial, masterSecret, keyExpansionLabel, seed[0:len(seed)]); pRF11(keyMaterial, masterSecret, keyExpansionLabel, seed[0:len(seed)]);
clientMAC = keyMaterial[0:macLen]; clientMAC = keyMaterial[0:macLen];
serverMAC = keyMaterial[macLen : macLen*2]; serverMAC = keyMaterial[macLen : macLen*2];
clientKey = keyMaterial[macLen*2 : macLen*2 + keyLen]; clientKey = keyMaterial[macLen*2 : macLen*2+keyLen];
serverKey = keyMaterial[macLen*2 + keyLen : len(keyMaterial)]; serverKey = keyMaterial[macLen*2+keyLen : len(keyMaterial)];
return; return;
} }

14
record_process.go
View File

@ -173,22 +173,22 @@ func (p *recordProcessor) processRecord(r *record) {
return; return;
} }
fillMACHeader(&p.header, p.seqNum, len(r.payload) - p.mac.Size(), r); fillMACHeader(&p.header, p.seqNum, len(r.payload)-p.mac.Size(), r);
p.seqNum++; p.seqNum++;
p.mac.Reset(); p.mac.Reset();
p.mac.Write(p.header[0:13]); p.mac.Write(p.header[0:13]);
p.mac.Write(r.payload[0 : len(r.payload) - p.mac.Size()]); p.mac.Write(r.payload[0 : len(r.payload)-p.mac.Size()]);
macBytes := p.mac.Sum(); macBytes := p.mac.Sum();
if subtle.ConstantTimeCompare(macBytes, r.payload[len(r.payload) - p.mac.Size() : len(r.payload)]) != 1 { if subtle.ConstantTimeCompare(macBytes, r.payload[len(r.payload)-p.mac.Size():len(r.payload)]) != 1 {
p.error(alertBadRecordMAC); p.error(alertBadRecordMAC);
return; return;
} }
switch r.contentType { switch r.contentType {
case recordTypeHandshake: case recordTypeHandshake:
p.processHandshakeRecord(r.payload[0 : len(r.payload) - p.mac.Size()]) p.processHandshakeRecord(r.payload[0 : len(r.payload)-p.mac.Size()])
case recordTypeChangeCipherSpec: case recordTypeChangeCipherSpec:
if len(r.payload) != 1 || r.payload[0] != 1 { if len(r.payload) != 1 || r.payload[0] != 1 {
p.error(alertUnexpectedMessage); p.error(alertUnexpectedMessage);
@ -237,12 +237,12 @@ func (p *recordProcessor) processHandshakeRecord(data []byte) {
handshakeLen := int(p.handshakeBuf[1])<<16 | handshakeLen := int(p.handshakeBuf[1])<<16 |
int(p.handshakeBuf[2])<<8 | int(p.handshakeBuf[2])<<8 |
int(p.handshakeBuf[3]); int(p.handshakeBuf[3]);
if handshakeLen + 4 > len(p.handshakeBuf) { if handshakeLen+4 > len(p.handshakeBuf) {
break break
} }
bytes := p.handshakeBuf[0 : handshakeLen + 4]; bytes := p.handshakeBuf[0 : handshakeLen+4];
p.handshakeBuf = p.handshakeBuf[handshakeLen + 4 : len(p.handshakeBuf)]; p.handshakeBuf = p.handshakeBuf[handshakeLen+4 : len(p.handshakeBuf)];
if bytes[0] == typeFinished { if bytes[0] == typeFinished {
// Special case because Finished is synchronous: the // Special case because Finished is synchronous: the
// handshake handler has to tell us if it's ok to start // handshake handler has to tell us if it's ok to start

20
record_write.go
View File

@ -89,18 +89,18 @@ func (w *recordWriter) loop(writer io.Writer, appChan <-chan []byte, controlChan
// fillMACHeader generates a MAC header. See RFC 4346, section 6.2.3.1. // fillMACHeader generates a MAC header. See RFC 4346, section 6.2.3.1.
func fillMACHeader(header *[13]byte, seqNum uint64, length int, r *record) { func fillMACHeader(header *[13]byte, seqNum uint64, length int, r *record) {
header[0] = uint8(seqNum>>56); header[0] = uint8(seqNum >> 56);
header[1] = uint8(seqNum>>48); header[1] = uint8(seqNum >> 48);
header[2] = uint8(seqNum>>40); header[2] = uint8(seqNum >> 40);
header[3] = uint8(seqNum>>32); header[3] = uint8(seqNum >> 32);
header[4] = uint8(seqNum>>24); header[4] = uint8(seqNum >> 24);
header[5] = uint8(seqNum>>16); header[5] = uint8(seqNum >> 16);
header[6] = uint8(seqNum>>8); header[6] = uint8(seqNum >> 8);
header[7] = uint8(seqNum); header[7] = uint8(seqNum);
header[8] = uint8(r.contentType); header[8] = uint8(r.contentType);
header[9] = r.major; header[9] = r.major;
header[10] = r.minor; header[10] = r.minor;
header[11] = uint8(length>>8); header[11] = uint8(length >> 8);
header[12] = uint8(length); header[12] = uint8(length);
} }
@ -116,8 +116,8 @@ func (w *recordWriter) writeRecord(r *record) {
w.encryptor.XORKeyStream(r.payload); w.encryptor.XORKeyStream(r.payload);
w.encryptor.XORKeyStream(macBytes); w.encryptor.XORKeyStream(macBytes);
length := len(r.payload)+len(macBytes); length := len(r.payload) + len(macBytes);
w.header[11] = uint8(length>>8); w.header[11] = uint8(length >> 8);
w.header[12] = uint8(length); w.header[12] = uint8(length);
w.writer.Write(w.header[8:13]); w.writer.Write(w.header[8:13]);
w.writer.Write(r.payload); w.writer.Write(r.payload);