This commit is contained in:
		
							
								
								
									
										12
									
								
								client/helpers/logger.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								client/helpers/logger.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,12 @@
 | 
				
			|||||||
 | 
					package helpers
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import (
 | 
				
			||||||
 | 
						"github.com/rs/zerolog"
 | 
				
			||||||
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					var logger zerolog.Logger
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// AddLogger sets the logger for the sublibrary
 | 
				
			||||||
 | 
					func AddLogger(l zerolog.Logger) {
 | 
				
			||||||
 | 
						logger = l
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										12
									
								
								client/logger.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								client/logger.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,12 @@
 | 
				
			|||||||
 | 
					package client
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import (
 | 
				
			||||||
 | 
						"github.com/rs/zerolog"
 | 
				
			||||||
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					var logger zerolog.Logger
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// AddLogger sets the logger for the sublibrary
 | 
				
			||||||
 | 
					func AddLogger(l zerolog.Logger) {
 | 
				
			||||||
 | 
						logger = l
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -1,7 +1,6 @@
 | 
				
			|||||||
package client
 | 
					package client
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import (
 | 
					import (
 | 
				
			||||||
	"fmt"
 | 
					 | 
				
			||||||
	"io"
 | 
						"io"
 | 
				
			||||||
	"os"
 | 
						"os"
 | 
				
			||||||
	"time"
 | 
						"time"
 | 
				
			||||||
@@ -206,7 +205,7 @@ func (p *Peer) AsymEncryptMessage(Message []byte) (*meowlib.EncryptedMessage, er
 | 
				
			|||||||
	// fmt.Println("[AsymEncryptMessage] Signature should be verified with:", p.MyIdentity.Public)
 | 
						// fmt.Println("[AsymEncryptMessage] Signature should be verified with:", p.MyIdentity.Public)
 | 
				
			||||||
	enc, err := meowlib.AsymEncryptAndSign(p.ContactEncryption, p.MyIdentity.Private, Message)
 | 
						enc, err := meowlib.AsymEncryptAndSign(p.ContactEncryption, p.MyIdentity.Private, Message)
 | 
				
			||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
		fmt.Println(err.Error())
 | 
							logger.Error().Err(err).Msg("Peer.AsymEncryptMessage")
 | 
				
			||||||
		return enc, err
 | 
							return enc, err
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	return enc, err
 | 
						return enc, err
 | 
				
			||||||
@@ -219,7 +218,7 @@ func (p *Peer) AsymDecryptMessage(Message []byte, Signature []byte) (DecryptedMe
 | 
				
			|||||||
	// fmt.Println("[AsymDecryptMessage] Signature will be verified with:", p.ContactPublicKey)
 | 
						// fmt.Println("[AsymDecryptMessage] Signature will be verified with:", p.ContactPublicKey)
 | 
				
			||||||
	DecryptedMessage, err = meowlib.AsymDecryptAndCheck(p.MyEncryptionKp.Private, p.ContactPublicKey, Message, Signature)
 | 
						DecryptedMessage, err = meowlib.AsymDecryptAndCheck(p.MyEncryptionKp.Private, p.ContactPublicKey, Message, Signature)
 | 
				
			||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
		fmt.Println(err.Error())
 | 
							logger.Error().Err(err).Msg("Peer.AsymDecryptMessage")
 | 
				
			||||||
		return nil, err
 | 
							return nil, err
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	return DecryptedMessage, err
 | 
						return DecryptedMessage, err
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,6 @@
 | 
				
			|||||||
package client
 | 
					package client
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import (
 | 
					import (
 | 
				
			||||||
	"fmt"
 | 
					 | 
				
			||||||
	"strings"
 | 
						"strings"
 | 
				
			||||||
	"time"
 | 
						"time"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -119,7 +118,7 @@ func (ints *Server) AsymEncryptMessage(Message []byte) (*meowlib.EncryptedMessag
 | 
				
			|||||||
	var enc *meowlib.EncryptedMessage
 | 
						var enc *meowlib.EncryptedMessage
 | 
				
			||||||
	enc, err := meowlib.AsymEncryptAndSign(ints.PublicKey, ints.UserKp.Private, Message)
 | 
						enc, err := meowlib.AsymEncryptAndSign(ints.PublicKey, ints.UserKp.Private, Message)
 | 
				
			||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
		fmt.Println(err.Error())
 | 
							logger.Error().Err(err).Msg("Server.AsymEncryptMessage")
 | 
				
			||||||
		return nil, err
 | 
							return nil, err
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	return enc, err
 | 
						return enc, err
 | 
				
			||||||
@@ -129,7 +128,7 @@ func (ints *Server) AsymEncryptMessage(Message []byte) (*meowlib.EncryptedMessag
 | 
				
			|||||||
func (ints *Server) AsymDecryptMessage(Message []byte, Signature []byte) (DecryptedMessage []byte, err error) {
 | 
					func (ints *Server) AsymDecryptMessage(Message []byte, Signature []byte) (DecryptedMessage []byte, err error) {
 | 
				
			||||||
	DecryptedMessage, err = meowlib.AsymDecryptAndCheck(ints.UserKp.Private, ints.PublicKey, Message, Signature)
 | 
						DecryptedMessage, err = meowlib.AsymDecryptAndCheck(ints.UserKp.Private, ints.PublicKey, Message, Signature)
 | 
				
			||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
		fmt.Println(err.Error())
 | 
							logger.Error().Err(err).Msg("Server.AsymDecryptMessage")
 | 
				
			||||||
		return nil, err
 | 
							return nil, err
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	return DecryptedMessage, err
 | 
						return DecryptedMessage, err
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user