clones/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2024-09-30 14:57:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

gofmt-ify asn1

Browse Source 
R=rsc
http://go/go-review/1018047
This commit is contained in:
Robert Griesemer 2009-11-04 17:03:08 -08:00
parent 517ebbb24a
commit 03678f7417
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pkg/asn1/asn1.go
View File

@ -110,9 +110,9 @@ func (b BitString) At(i int) int {
if i < 0 || i >= b.BitLength {
return 0;
}
x := i / 8;
y := 7 - uint(i % 8);
return int(b.Bytes[x] >> y) & 1;
x := i/8;
y := 7-uint(i%8);
return int(b.Bytes[x] >> y)&1;
}
// parseBitString parses an ASN.1 bit string from the given byte array and returns it.
@ -124,7 +124,7 @@ func parseBitString(bytes []byte) (ret BitString, err os.Error) {
paddingBits := int(bytes[0]);
if paddingBits > 7 ||
len(bytes) == 1 && paddingBits > 0 ||
bytes[len(bytes)-1] & ((1 << bytes[0])-1) != 0 {
bytes[len(bytes)-1]&((1<<bytes[0])-1) != 0 {
err = SyntaxError{"invalid padding bits in BIT STRING"};
return;
}
@ -152,8 +152,8 @@ func parseObjectIdentifier(bytes []byte) (s []int, err os.Error) {
s = make([]int, len(bytes)+1);
// The first byte is 40*value1 + value2:
s[0] = int(bytes[0]) / 40;
s[1] = int(bytes[0]) % 40;
s[0] = int(bytes[0])/40;
s[1] = int(bytes[0])%40;
i := 2;
for offset := 1; offset < len(bytes); i++ {
var v int;
@ -201,7 +201,7 @@ func twoDigits(bytes []byte, max int) (int, bool) {
return 0, false;
}
}
value := (int(bytes[0]) - '0')*10 + int(bytes[1] - '0');
value := (int(bytes[0])-'0')*10 + int(bytes[1]-'0');
if value > max {
return 0, false;
}
@ -459,8 +459,8 @@ type fieldParameters struct {
defaultValue *int64; // a default value for INTEGER typed fields (maybe nil).
tag *int; // the EXPLICIT or IMPLICIT tag (maybe nil).
// Invariants:
// if explicit is set, tag is non-nil.
// Invariants:
// if explicit is set, tag is non-nil.
}
// Given a tag string with the format specified in the package comment,

2
src/pkg/asn1/asn1_test.go
View File

@ -255,7 +255,7 @@ var unmarshalTestData []unmarshalTest = []unmarshalTest{
unmarshalTest{[]byte{0x16, 0x04, 't', 'e', 's', 't'}, &RawValue{0, 22, false, []byte{'t', 'e', 's', 't'}}},
unmarshalTest{[]byte{0x04, 0x04, 1, 2, 3, 4}, &RawValue{0, 4, false, []byte{1, 2, 3, 4}}},
unmarshalTest{[]byte{0x30, 0x03, 0x81, 0x01, 0x01}, &TestContextSpecificTags{1}},
unmarshalTest{[]byte{0x30, 0x08, 0xa1, 0x03, 0x02, 0x01, 0x01, 0x02, 0x01, 0x02}, &TestContextSpecificTags2{1,2}},
unmarshalTest{[]byte{0x30, 0x08, 0xa1, 0x03, 0x02, 0x01, 0x01, 0x02, 0x01, 0x02}, &TestContextSpecificTags2{1, 2}},
unmarshalTest{[]byte{0x01, 0x01, 0x00}, newBool(false)},
unmarshalTest{[]byte{0x01, 0x01, 0x01}, newBool(true)},
}