1 files changed, 10 insertions, 7 deletions

diff --git a/ber.go b/ber.go
index 3e99a27..95755fe 100644
--- a/ber.go
+++ b/ber.go
@@ -255,12 +255,8 @@ func ReadPacket(reader io.Reader) (*Packet, error) {
 	return p, nil
 }
 
-func DecodeString(data []byte) (ret string) {
-	for _, c := range data {
-		ret += fmt.Sprintf("%c", c)
-	}
-
-	return
+func DecodeString(data []byte) (string) {
+	return string(data)
 }
 
 func DecodeInteger(data []byte) (ret uint64) {
@@ -294,7 +290,14 @@ func EncodeInteger(val uint64) []byte {
 		mask = mask >> 8
 	}
 
-	return out.Bytes()
+	byteSlice := out.Bytes()
+
+	// if first bit in first byte is 1 it is necessary to append a leading 00 byte to make signum clear
+	// otherwise it happens that a request with messageId => 02 01 80 get response with messageId => 02 04 FF FF FF 80
+	if len(byteSlice) > 0 && byteSlice[0]&byte(128) != 0 {
+		return append([]byte{0x00}, byteSlice...)
+	}
+	return byteSlice
 }
 
 func DecodePacket(data []byte) *Packet {