From 034dcf52152286e50947e380afde5314ea61b1e2 Mon Sep 17 00:00:00 2001 From: ycc Date: Fri, 16 Feb 2024 19:03:45 +0100 Subject: [PATCH] Add invitation to user message and comment out debug print statements --- client/peer.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/client/peer.go b/client/peer.go index e4643da..8a50f87 100644 --- a/client/peer.go +++ b/client/peer.go @@ -155,6 +155,7 @@ func (p *Peer) BuildInvitationAnswerMessage(myContactCard *meowlib.ContactCard) } invitation.Payload = out msg.Destination = p.ContactLookupKey + msg.Invitation = &invitation msg.From = p.MyIdentity.Public msg.Type = "1" return &msg, nil @@ -184,10 +185,10 @@ func (p *Peer) DeserializeUserMessage(data []byte) (*meowlib.UserMessage, error) // AsymEncryptMessage prepares a message to send to a specific peer contact func (p *Peer) AsymEncryptMessage(Message []byte) (*meowlib.EncryptedMessage, error) { var enc *meowlib.EncryptedMessage - fmt.Println("[AsymEncryptMessage] Destination is:", p.ContactLookupKey) - fmt.Println("[AsymEncryptMessage] Contact encryption key is:", p.ContactEncryption) - fmt.Println("[AsymEncryptMessage] My signing key is:", p.MyIdentity.Private) - fmt.Println("[AsymEncryptMessage] Signature should be verified with:", p.MyIdentity.Public) + // fmt.Println("[AsymEncryptMessage] Destination is:", p.ContactLookupKey) + // fmt.Println("[AsymEncryptMessage] Contact encryption key is:", p.ContactEncryption) + // fmt.Println("[AsymEncryptMessage] My signing key is:", p.MyIdentity.Private) + // fmt.Println("[AsymEncryptMessage] Signature should be verified with:", p.MyIdentity.Public) enc, err := meowlib.AsymEncryptAndSign(p.ContactEncryption, p.MyIdentity.Private, Message) if err != nil { fmt.Println(err.Error()) @@ -198,9 +199,9 @@ func (p *Peer) AsymEncryptMessage(Message []byte) (*meowlib.EncryptedMessage, er // AsymDecryptMessage reads a message from a specific peer contact func (p *Peer) AsymDecryptMessage(Message []byte, Signature []byte) (DecryptedMessage []byte, err error) { - fmt.Println("[AsymDecryptMessage] Decrypting key is:", p.MyEncryptionKp.Private) - fmt.Println("[AsymDecryptMessage] Should have been encrypted with:", p.MyEncryptionKp.Public) - fmt.Println("[AsymDecryptMessage] Signature will be verified with:", p.ContactPublicKey) + // fmt.Println("[AsymDecryptMessage] Decrypting key is:", p.MyEncryptionKp.Private) + // fmt.Println("[AsymDecryptMessage] Should have been encrypted with:", p.MyEncryptionKp.Public) + // fmt.Println("[AsymDecryptMessage] Signature will be verified with:", p.ContactPublicKey) DecryptedMessage, err = meowlib.AsymDecryptAndCheck(p.MyEncryptionKp.Private, p.ContactPublicKey, Message, Signature) if err != nil { fmt.Println(err.Error())