Skip to content
Snippets Groups Projects
Commit a260340f authored by benjamin's avatar benjamin
Browse files

Merge remote-tracking branch 'origin/project/Channels' into project/Channels

parents a56e85fa 18c60f72
No related branches found
No related tags found
3 merge requests!510Release,!419rewrote the health tracker to both consider if there are waiting rounds and...,!340Project/channels
......@@ -141,7 +141,7 @@ func ConstructIdentity(pubKey []byte, codesetVersion int) ([]byte, error) {
if err != nil {
return nil, err
}
return identity.Marshal(), nil
return json.Marshal(identity)
}
// ImportPrivateIdentity generates a new [channel.PrivateIdentity] from exported
......
......@@ -99,6 +99,10 @@ func (c *Cmix) ReadyToSend() bool {
jww.FATAL.Panicf("Failed to get node registration status: %+v", err)
}
// FIXME: This is a fix put in place because not all nodes in the NDF are
// online. This should be fixed.
total = 340
return numReg >= total*7/10
}
......
......@@ -8,6 +8,8 @@
package nodes
import (
"io"
"github.com/golang/protobuf/proto"
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
......@@ -27,7 +29,6 @@ import (
"gitlab.com/xx_network/crypto/tls"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
"io"
)
// requestKey is a helper function which constructs a ClientKeyRequest message.
......@@ -184,7 +185,7 @@ func processRequestResponse(signedKeyResponse *pb.SignedKeyResponse,
}
// Verify the response signature
err = rsa.Verify(nodePubKey, opts.Hash, hashedResponse,
err = verifyNodeSignature(nodePubKey, opts.Hash, hashedResponse,
signedKeyResponse.KeyResponseSignedByGateway.Signature, opts)
if err != nil {
return nil, nil, 0,
......
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2022 xx foundation //
// //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
//go:build !js || !wasm
package nodes
import (
"crypto"
"gitlab.com/xx_network/crypto/signature/rsa"
)
func verifyNodeSignature(pub *rsa.PublicKey, hash crypto.Hash,
hashed []byte, sig []byte, opts *rsa.Options) error {
// Verify the response signature
return rsa.Verify(pub, hash, hashed, sig, opts)
}
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2022 xx foundation //
// //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
//go:build js && wasm
package nodes
import (
"crypto"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/xx_network/crypto/signature/rsa"
)
func verifyNodeSignature(pub *rsa.PublicKey, hash crypto.Hash,
hashed []byte, sig []byte, opts *rsa.Options) error {
jww.WARN.Printf("node signature checking disabled for wasm")
return nil
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment