qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 18:54:44 -07:00
Code Releases Activity

encoding/asn1: harmonise error prefixes.

Browse Source 
This change ensures that error messages always start with "asn1: ".

R=golang-dev, gedimitr
CC=golang-dev
https://golang.org/cl/9751043
This commit is contained in:
Adam Langley 2013-06-04 19:51:26 -04:00
parent 781b2a2519
commit eec014de66
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pkg/encoding/asn1/asn1.go Executable file → Normal file
View File

@ -32,14 +32,14 @@ type StructuralError struct {
Msg string Msg string
} }
func (e StructuralError) Error() string { return "ASN.1 structure error: " + e.Msg } func (e StructuralError) Error() string { return "asn1: structure error: " + e.Msg }
// A SyntaxError suggests that the ASN.1 data is invalid. // A SyntaxError suggests that the ASN.1 data is invalid.
type SyntaxError struct { type SyntaxError struct {
Msg string Msg string
} }
func (e SyntaxError) Error() string { return "ASN.1 syntax error: " + e.Msg } func (e SyntaxError) Error() string { return "asn1: syntax error: " + e.Msg }
// We start by dealing with each of the primitive types in turn. // We start by dealing with each of the primitive types in turn.
@ -47,7 +47,7 @@ func (e SyntaxError) Error() string { return "ASN.1 syntax error: " + e.Msg }
func parseBool(bytes []byte) (ret bool, err error) { func parseBool(bytes []byte) (ret bool, err error) {
if len(bytes) != 1 { if len(bytes) != 1 {
err = SyntaxError{"encoding/asn1: invalid boolean"} err = SyntaxError{"invalid boolean"}
return return
} }
@ -60,7 +60,7 @@ func parseBool(bytes []byte) (ret bool, err error) {
case 0xff: case 0xff:
ret = true ret = true
default: default:
err = SyntaxError{"encoding/asn1: invalid boolean"} err = SyntaxError{"invalid boolean"}
} }
return return
@ -585,7 +585,7 @@ func parseField(v reflect.Value, bytes []byte, initOffset int, params fieldParam
} }
} else { } else {
if fieldType != flagType { if fieldType != flagType {
err = StructuralError{"Zero length explicit tag was not an asn1.Flag"} err = StructuralError{"zero length explicit tag was not an asn1.Flag"}
return return
} }
v.SetBool(true) v.SetBool(true)

0
src/pkg/encoding/asn1/asn1_test.go Executable file → Normal file
View File

6
src/pkg/encoding/asn1/marshal.go
View File

@ -304,7 +304,7 @@ func marshalUTCTime(out *forkableWriter, t time.Time) (err error) {
case 2000 <= year && year < 2050: case 2000 <= year && year < 2050:
err = marshalTwoDigits(out, int(year-2000)) err = marshalTwoDigits(out, int(year-2000))
default: default:
return StructuralError{"Cannot represent time as UTCTime"} return StructuralError{"cannot represent time as UTCTime"}
} }
if err != nil { if err != nil {
return return
@ -501,7 +501,7 @@ func marshalField(out *forkableWriter, v reflect.Value, params fieldParameters)
class := classUniversal class := classUniversal
if params.stringType != 0 && tag != tagPrintableString { if params.stringType != 0 && tag != tagPrintableString {
return StructuralError{"Explicit string type given to non-string member"} return StructuralError{"explicit string type given to non-string member"}
} }
if tag == tagPrintableString { if tag == tagPrintableString {
@ -525,7 +525,7 @@ func marshalField(out *forkableWriter, v reflect.Value, params fieldParameters)
if params.set { if params.set {
if tag != tagSequence { if tag != tagSequence {
return StructuralError{"Non sequence tagged as set"} return StructuralError{"non sequence tagged as set"}
} }
tag = tagSet tag = tagSet
} }