Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mf
go-multiaddr
Commits
927b81c5
Commit
927b81c5
authored
Mar 30, 2021
by
Marten Seemann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix error strings
parent
e2f4e4e8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
transcoders.go
transcoders.go
+6
-6
No files found.
transcoders.go
View file @
927b81c5
...
...
@@ -137,12 +137,12 @@ var TranscoderOnion = NewTranscoderFromFunctions(onionStB, onionBtS, nil)
func
onionStB
(
s
string
)
([]
byte
,
error
)
{
addr
:=
strings
.
Split
(
s
,
":"
)
if
len
(
addr
)
!=
2
{
return
nil
,
fmt
.
Errorf
(
"failed to parse onion addr: %s does not contain a port number
.
"
,
s
)
return
nil
,
fmt
.
Errorf
(
"failed to parse onion addr: %s does not contain a port number"
,
s
)
}
// onion address without the ".onion" substring
if
len
(
addr
[
0
])
!=
16
{
return
nil
,
fmt
.
Errorf
(
"failed to parse onion addr: %s not a Tor onion address
.
"
,
s
)
return
nil
,
fmt
.
Errorf
(
"failed to parse onion addr: %s not a Tor onion address"
,
s
)
}
onionHostBytes
,
err
:=
base32
.
StdEncoding
.
DecodeString
(
strings
.
ToUpper
(
addr
[
0
]))
if
err
!=
nil
{
...
...
@@ -180,7 +180,7 @@ var TranscoderOnion3 = NewTranscoderFromFunctions(onion3StB, onion3BtS, nil)
func
onion3StB
(
s
string
)
([]
byte
,
error
)
{
addr
:=
strings
.
Split
(
s
,
":"
)
if
len
(
addr
)
!=
2
{
return
nil
,
fmt
.
Errorf
(
"failed to parse onion addr: %s does not contain a port number
.
"
,
s
)
return
nil
,
fmt
.
Errorf
(
"failed to parse onion addr: %s does not contain a port number"
,
s
)
}
// onion address without the ".onion" substring
...
...
@@ -228,7 +228,7 @@ func garlic64StB(s string) ([]byte, error) {
// i2p base64 address will be between 516 and 616 characters long, depending on
// certificate type
if
len
(
s
)
<
516
||
len
(
s
)
>
616
{
return
nil
,
fmt
.
Errorf
(
"failed to parse garlic addr: %s not an i2p base64 address. len: %d
\n
"
,
s
,
len
(
s
))
return
nil
,
fmt
.
Errorf
(
"failed to parse garlic addr: %s not an i2p base64 address. len: %d"
,
s
,
len
(
s
))
}
garlicHostBytes
,
err
:=
garlicBase64Encoding
.
DecodeString
(
s
)
if
err
!=
nil
{
...
...
@@ -249,7 +249,7 @@ func garlic64BtS(b []byte) (string, error) {
func
garlic64Validate
(
b
[]
byte
)
error
{
// A garlic64 address will always be greater than 386 bytes long when encoded.
if
len
(
b
)
<
386
{
return
fmt
.
Errorf
(
"failed to validate garlic addr: %s not an i2p base64 address. len: %d
\n
"
,
b
,
len
(
b
))
return
fmt
.
Errorf
(
"failed to validate garlic addr: %s not an i2p base64 address. len: %d"
,
b
,
len
(
b
))
}
return
nil
}
...
...
@@ -286,7 +286,7 @@ func garlic32Validate(b []byte) error {
// an i2p base64 for an Encrypted Leaseset v2 will be at least 35 bytes
// long other than that, they will be exactly 32 bytes
if
len
(
b
)
<
35
&&
len
(
b
)
!=
32
{
return
fmt
.
Errorf
(
"failed to validate garlic addr: %s not an i2p base32 address. len: %d
\n
"
,
b
,
len
(
b
))
return
fmt
.
Errorf
(
"failed to validate garlic addr: %s not an i2p base32 address. len: %d"
,
b
,
len
(
b
))
}
return
nil
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment