Skip to content

Commit 8396b1e

Browse files
committed
golang.org/x/crypto cvss; little
1 parent ac01c4e commit 8396b1e

File tree

4 files changed

+19
-6
lines changed

4 files changed

+19
-6
lines changed

console.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ type (
5858
BytesFormat string
5959

6060
StringOnNewLineMinLen int
61+
BytesDumpMinLen int
6162

6263
PairSeparator string
6364
KVSeparator string
@@ -171,6 +172,7 @@ func NewConsoleWriter(w io.Writer, f int) *ConsoleWriter {
171172
CallerFormat: "%v",
172173

173174
StringOnNewLineMinLen: 71,
175+
BytesDumpMinLen: 10,
174176

175177
PairSeparator: " ",
176178
KVSeparator: "=",
@@ -678,7 +680,7 @@ func (w *ConsoleWriter) ConvertValue(b, p []byte, st, ff int) (_ []byte, i int)
678680
var s []byte
679681
s, i = w.d.Bytes(p, st)
680682

681-
if tag == tlwire.Bytes && w.StringOnNewLineMinLen != 0 && len(s) >= w.StringOnNewLineMinLen {
683+
if tag == tlwire.Bytes && w.BytesDumpMinLen != 0 && len(s) >= w.BytesDumpMinLen {
682684
b = append(b, '\\', '\n')
683685

684686
h := hex.Dumper(noescapeByteWriter(&b))

go.mod

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
module tlog.app/go/tlog
22

3-
go 1.22
3+
go 1.23.0
4+
5+
toolchain go1.24.0
46

57
require (
68
github.com/nikandfor/assert v0.0.0-20231112165957-bf2ce0a3555a
79
github.com/stretchr/testify v1.10.0
810
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
9-
golang.org/x/term v0.29.0
11+
golang.org/x/term v0.31.0
1012
nikand.dev/go/cbor v0.0.0-20250217185914-a319e53bb3df
1113
nikand.dev/go/hacked v0.0.0-20250303011940-bcd287f6db83
1214
tlog.app/go/eazy v0.4.2
@@ -18,6 +20,7 @@ require (
1820
github.com/davecgh/go-spew v1.1.1 // indirect
1921
github.com/kr/text v0.2.0 // indirect
2022
github.com/pmezard/go-difflib v1.0.0 // indirect
21-
golang.org/x/sys v0.30.0 // indirect
23+
golang.org/x/crypto v0.37.0 // indirect
24+
golang.org/x/sys v0.32.0 // indirect
2225
gopkg.in/yaml.v3 v3.0.1 // indirect
2326
)

go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,18 @@ github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDN
1313
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
1414
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
1515
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
16+
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
17+
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
18+
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
19+
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
1620
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
1721
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
1822
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
1923
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
24+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
2025
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
2126
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
27+
golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
2228
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
2329
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
2430
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

wire.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,12 @@ func appendKVs(e *tlwire.Encoder, b []byte, kvs []interface{}) []byte {
143143
}
144144

145145
switch v := kvs[i].(type) {
146-
case string:
147-
b = e.AppendString(b, v)
148146
case int:
149147
b = e.AppendInt(b, v)
148+
case string:
149+
b = e.AppendString(b, v)
150+
case []byte:
151+
b = e.AppendBytes(b, v)
150152
case RawMessage:
151153
b = append(b, v...)
152154
case Modify:

0 commit comments

Comments
 (0)