mitchell/selfpass
1
0
Fork 0
mirror of https://github.com/mitchell/selfpass.git synced 2025-12-15 21:47:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change all key generation to use PBKDF2;

Browse source 
change all internal encryption back to cbc mode;
add hidden command to convert from gcm to cbc internally
This commit is contained in:
mitchell 2019-07-08 20:45:01 -04:00
parent da95f9a5f0
commit 347fbe7268
12 changed files with 288 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cli/commands/decrypt.go
View file

@ -1,7 +1,6 @@
package commands
import (
"encoding/hex"
"fmt"
"io/ioutil"
"os"
@ -34,11 +33,8 @@ the new file.`,
contents, err := ioutil.ReadFile(file)
check(err)
key, err := hex.DecodeString(cfg.GetString(types.KeyPrivateKey))
check(err)
passkey, err := crypto.CombinePasswordAndKey([]byte(masterpass), []byte(key))
check(err)
key := cfg.GetString(types.KeyPrivateKey)
passkey := crypto.GeneratePBKDF2Key([]byte(masterpass), []byte(key))
contents, err = crypto.GCMDecrypt(passkey, contents)
check(err)

8
cli/commands/encrypt.go
View file

@ -1,7 +1,6 @@
package commands
import (
"encoding/hex"
"fmt"
"io/ioutil"
"os"
@ -30,11 +29,8 @@ new file.`,
contents, err := ioutil.ReadFile(file)
check(err)
key, err := hex.DecodeString(cfg.GetString(types.KeyPrivateKey))
check(err)
passkey, err := crypto.CombinePasswordAndKey([]byte(masterpass), []byte(key))
check(err)
key := cfg.GetString(types.KeyPrivateKey)
passkey := crypto.GeneratePBKDF2Key([]byte(masterpass), []byte(key))
contents, err = crypto.GCMEncrypt(passkey, contents)
check(err)

1
cli/commands/root.go
View file

@ -38,6 +38,7 @@ can interact with the entire Selfpass API.`,
commands.MakeUpdate(mgr, makeInitClient(mgr, clientInit)),
commands.MakeGet(mgr, makeInitClient(mgr, clientInit)),
commands.MakeDelete(makeInitClient(mgr, clientInit)),
commands.MakeGCMToCBC(mgr, makeInitClient(mgr, clientInit)),
)
check(rootCmd.Execute())