Skip to content
Snippets Groups Projects
Commit ef8d9e5e authored by Josh Brooks's avatar Josh Brooks
Browse files

Clean up branch

parent 5661da4a
No related branches found
No related tags found
2 merge requests!510Release,!333Frond End Assistance And Iterative Clean Up
package bindings
...@@ -160,13 +160,6 @@ func (e *E2e) GetUdContactFromNdf() ([]byte, error) { ...@@ -160,13 +160,6 @@ func (e *E2e) GetUdContactFromNdf() ([]byte, error) {
udDhPubKeyData := netDef.UDB.DhPubKey udDhPubKeyData := netDef.UDB.DhPubKey
udDhPubKey := e2eGroup.NewInt(1) udDhPubKey := e2eGroup.NewInt(1)
err = udDhPubKey.UnmarshalJSON(udDhPubKeyData) err = udDhPubKey.UnmarshalJSON(udDhPubKeyData)
jww.WARN.Printf("GetUdContactFromNdf debug\n"+
"netDef UD: %v\n"+
"netDef DHPubKey: %v\n"+
"udDhPubKey.UnmarshalJSON (key:%v, err: %v)\n",
netDef.UDB, netDef.UDB.DhPubKey, udDhPubKey, err)
if err != nil { if err != nil {
jww.WARN.Printf("GetUdContactFromNdf debug fails on udDhPubKey.UnmarshalJSON") jww.WARN.Printf("GetUdContactFromNdf debug fails on udDhPubKey.UnmarshalJSON")
return nil, err return nil, err
......
...@@ -8,9 +8,7 @@ ...@@ -8,9 +8,7 @@
package bindings package bindings
import ( import (
"encoding/base64"
"encoding/json" "encoding/json"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/xxdk" "gitlab.com/elixxir/client/xxdk"
"gitlab.com/elixxir/crypto/contact" "gitlab.com/elixxir/crypto/contact"
"gitlab.com/elixxir/primitives/fact" "gitlab.com/elixxir/primitives/fact"
...@@ -95,8 +93,6 @@ func (c *Cmix) MakeLegacyReceptionIdentity() ([]byte, error) { ...@@ -95,8 +93,6 @@ func (c *Cmix) MakeLegacyReceptionIdentity() ([]byte, error) {
// the xx network. // the xx network.
func (c *Cmix) GetReceptionRegistrationValidationSignature() []byte { func (c *Cmix) GetReceptionRegistrationValidationSignature() []byte {
regSig := c.api.GetStorage().GetReceptionRegistrationValidationSignature() regSig := c.api.GetStorage().GetReceptionRegistrationValidationSignature()
jww.WARN.Printf("UD DEBUG: Reception reg valid sig: %v",
base64.StdEncoding.EncodeToString(regSig))
return regSig return regSig
} }
......
...@@ -8,10 +8,8 @@ ...@@ -8,10 +8,8 @@
package registration package registration
import ( import (
"encoding/base64"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"github.com/pkg/errors" "github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
pb "gitlab.com/elixxir/comms/mixmessages" pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/crypto/registration" "gitlab.com/elixxir/crypto/registration"
"gitlab.com/xx_network/comms/connect" "gitlab.com/xx_network/comms/connect"
...@@ -83,13 +81,6 @@ func register(comms registrationMessageSender, host *connect.Host, ...@@ -83,13 +81,6 @@ func register(comms registrationMessageSender, host *connect.Host,
"transmission confirmation message") "transmission confirmation message")
} }
jww.WARN.Printf("UD DEBUG: IN NETWORK REGISTER:"+
"\ntimestamp: %d"+
"\nrsa pub key PEM: %s"+
"\nperm sig: %s",
receptionConfirmation.Timestamp, receptionPem, base64.StdEncoding.EncodeToString(receptionSignature),
)
// Verify transmission signature // Verify transmission signature
transmissionSignature := response.GetClientTransmissionConfirmation(). transmissionSignature := response.GetClientTransmissionConfirmation().
GetRegistrarSignature().Signature GetRegistrarSignature().Signature
......
...@@ -3,7 +3,6 @@ package ud ...@@ -3,7 +3,6 @@ package ud
import ( import (
"fmt" "fmt"
"github.com/pkg/errors" "github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
pb "gitlab.com/elixxir/comms/mixmessages" pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/crypto/diffieHellman" "gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/factID" "gitlab.com/elixxir/crypto/factID"
...@@ -47,14 +46,6 @@ func (m *Manager) register(username string, networkSignature []byte, ...@@ -47,14 +46,6 @@ func (m *Manager) register(username string, networkSignature []byte,
Timestamp: m.user.GetTransmissionIdentity().RegistrationTimestamp, Timestamp: m.user.GetTransmissionIdentity().RegistrationTimestamp,
} }
jww.WARN.Printf("UD DEBUG:"+
"\npermSig: %s"+
"\nrsaPubKey: %s"+
"\ntimestamp: %v",
networkSignature,
string(rsa.CreatePublicKeyPem(privKey.GetPublic())),
m.user.GetTransmissionIdentity().RegistrationTimestamp)
// Sign the identity data and add to user registration message // Sign the identity data and add to user registration message
identityDigest := msg.IdentityRegistration.Digest() identityDigest := msg.IdentityRegistration.Digest()
msg.IdentitySignature, err = rsa.Sign(rng, privKey, msg.IdentitySignature, err = rsa.Sign(rng, privKey,
......
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