github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-21 05:43:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

.

Browse source
This commit is contained in:
Adam Ierymenko 2019-09-25 14:31:08 -07:00
commit 5175636d36
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
go/pkg/zerotier/identity.go
View file

@ -126,7 +126,7 @@ func (id *Identity) String() string {
switch id.idtype {
case IdentityTypeC25519:
if len(id.publicKey) == IdentityTypeC25519PublicKeySize {
return fmt.Sprintf("%.10x:0:%x", id.address, id.publicKey)
return fmt.Sprintf("%.10x:0:%x", uint64(id.address), id.publicKey)
}
case IdentityTypeP384:
if len(id.publicKey) == IdentityTypeP384PublicKeySize {
@ -148,7 +148,11 @@ func (id *Identity) UnmarshalJSON(j []byte) error {
if err != nil {
return err
}
fmt.Println(s)
nid, err := NewIdentityFromString(s)
if err != nil {
return err
}
*id = *nid
return err
return nil
}