aboutsummaryrefslogtreecommitdiff
path: root/ber
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2015-08-09 14:24:00 +0200
committerDimitri Sokolyuk <demon@dim13.org>2015-08-09 14:24:00 +0200
commita80b9d1c1a0de5602735814363c26e201387aca3 (patch)
tree37c0bedc2bc2e7a2df644a649179f0111ef93d71 /ber
parente398868cca4fe6bc916a5f3e7d3e99de16485490 (diff)
optimize
Diffstat (limited to 'ber')
-rw-r--r--ber/int.go10
-rw-r--r--ber/len.go10
2 files changed, 11 insertions, 9 deletions
diff --git a/ber/int.go b/ber/int.go
index bcdc96f..41defc8 100644
--- a/ber/int.go
+++ b/ber/int.go
@@ -15,11 +15,11 @@ func UnmarshalInt(b []byte) (i int) {
}
func intLen(i int) (n int) {
- for i > 255 {
+ for i > 127 {
n++
i >>= 8
}
- for i < -256 {
+ for i < -128 {
n++
i >>= 8
}
@@ -30,11 +30,5 @@ func MarshalInt(i int) (b []byte) {
for n := intLen(i); n > 0; n-- {
b = append(b, byte(i>>uint((n-1)*8)))
}
- if i > 0 && b[0]&0x80 != 0 {
- b = append([]byte{0x00}, b...)
- }
- if i < 0 && b[0]&0x80 == 0 {
- b = append([]byte{0xFF}, b...)
- }
return
}
diff --git a/ber/len.go b/ber/len.go
index 55262e0..e1d7933 100644
--- a/ber/len.go
+++ b/ber/len.go
@@ -11,11 +11,19 @@ func UnmarshalLen(b []byte) (i, n int) {
return i, n + 1
}
+func lenLen(i int) (n int) {
+ for i > 255 {
+ n++
+ i >>= 8
+ }
+ return n + 1
+}
+
func MarshalLen(i int) (b []byte) {
if i < 0x80 {
return []byte{byte(i)}
}
- for n := intLen(i); n > 0; n-- {
+ for n := lenLen(i); n > 0; n-- {
b = append(b, byte(i>>uint((n-1)*8)))
}
b = append([]byte{byte(len(b) | 0x80)}, b...)