From 56550c1b6104dd073d405c1a021a6b552bb58e34 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Fri, 27 Mar 2020 12:57:53 +0100 Subject: [PATCH 1/2] keystore: Switch from Bytes() to MarshalPrivateKey() Bytes is deprecated. --- keystore/keystore.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keystore/keystore.go b/keystore/keystore.go index a52b4ad1711..ed83c17e6a8 100644 --- a/keystore/keystore.go +++ b/keystore/keystore.go @@ -81,7 +81,7 @@ func (ks *FSKeystore) Put(name string, k ci.PrivKey) error { return err } - b, err := k.Bytes() + b, err := ci.MarshalPrivateKey(k) if err != nil { return err } From 4a7373bc6ac04cc552023d99b9a0c03bd2d677ab Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Fri, 27 Mar 2020 12:59:10 +0100 Subject: [PATCH 2/2] keystore: create new keys with 0400 permissions (as spec'ed) Spec is pretty much out of date but specifies this. https://github.com/ipfs/specs/blob/master/KEYSTORE.md --- keystore/keystore.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keystore/keystore.go b/keystore/keystore.go index ed83c17e6a8..0a2fed3bfc6 100644 --- a/keystore/keystore.go +++ b/keystore/keystore.go @@ -88,7 +88,7 @@ func (ks *FSKeystore) Put(name string, k ci.PrivKey) error { kp := filepath.Join(ks.dir, name) - fi, err := os.OpenFile(kp, os.O_CREATE|os.O_EXCL|os.O_WRONLY, 0600) + fi, err := os.OpenFile(kp, os.O_CREATE|os.O_EXCL|os.O_WRONLY, 0400) if err != nil { if os.IsExist(err) { err = ErrKeyExists