yves/meowlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Reduce return values for mobile compatibility

Browse Source
This commit is contained in:
ycc
2022-12-19 20:15:53 +01:00
parent c6ec65f3fa
commit 9e56d3eb03
7 changed files with 95 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/identity.go
View File

@ -3,7 +3,8 @@ package server
import (
"encoding/json"
"fmt"
"io/ioutil"
"os"
"forge.redroom.link/yves/meowlib"
"github.com/ProtonMail/gopenpgp/v2/helper"
@ -33,7 +34,7 @@ func CreateIdentity(ServerName string, ServerDesc string) *Identity {
func LoadIdentity(File string) (*Identity, error) {
var id Identity
indata, err := ioutil.ReadFile(File)
indata, err := os.ReadFile(File)
if err != nil {
return nil, err
}
@ -51,7 +52,7 @@ func (id *Identity) Save(file string) error {
if err != nil {
return err
}
err = ioutil.WriteFile(file, []byte(armor), 0644)
err = os.WriteFile(file, []byte(armor), 0644)
return err
}
@ -127,13 +128,14 @@ func (id *Identity) SerializeFromServerMessage(msg *meowlib.FromServerMessage) (
}
// AsymEncryptMessage prepares a message to send to a specific peer contact
func (id *Identity) AsymEncryptMessage(peerPublicKey string, Message []byte) (EncryptedMsg []byte, Signature []byte, err error) {
EncryptedMsg, Signature, err = meowlib.AsymEncryptAndSign(peerPublicKey, id.ServerKp.Private, Message)
func (id *Identity) AsymEncryptMessage(peerPublicKey string, Message []byte) (*meowlib.EncryptedMessage, error) {
var enc *meowlib.EncryptedMessage
enc, err := meowlib.AsymEncryptAndSign(peerPublicKey, id.ServerKp.Private, Message)
if err != nil {
fmt.Println(err.Error())
return nil, nil, err
return nil, err
}
return EncryptedMsg, Signature, err
return enc, err
}
func (id *Identity) PackForSending(encryptedMessage []byte, signature []byte) (fromServerMessage []byte, err error) {
@ -154,11 +156,11 @@ func (id *Identity) ProcessOutbound(peerPublicKey string, msg *meowlib.FromServe
if err != nil {
return nil, err
}
srv_resp, srv_respsig, err := id.AsymEncryptMessage(peerPublicKey, encoded_srv_fromServerMessage)
srv_resp, err := id.AsymEncryptMessage(peerPublicKey, encoded_srv_fromServerMessage)
if err != nil {
return nil, err
}
resp, err := id.PackForSending(srv_resp, srv_respsig)
resp, err := id.PackForSending(srv_resp.Data, srv_resp.Signature)
if err != nil {
return nil, err
}