From 94655cda38572c0ab1d879e003a11f160edfd9a2 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 13 Feb 2018 01:52:43 +0100 Subject: unexport --- cmd_generate.go | 6 +++--- cmd_sign.go | 6 +++--- cmd_verify.go | 2 +- files.go | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cmd_generate.go b/cmd_generate.go index 57391f6..9c6006f 100644 --- a/cmd_generate.go +++ b/cmd_generate.go @@ -56,11 +56,11 @@ func (m *generateCmd) Execute(ctx context.Context, f *flag.FlagSet, args ...inte return subcommands.ExitFailure } - if err := m.writeFile(m.secFile, "secret key", secKey, ModeSec); err != nil { + if err := m.writeFile(m.secFile, "secret key", secKey, modeSec); err != nil { log.Println(err) return subcommands.ExitFailure } - if err := m.writeFile(m.pubFile, "public key", pubKey, ModePub); err != nil { + if err := m.writeFile(m.pubFile, "public key", pubKey, modePub); err != nil { log.Println(err) return subcommands.ExitFailure } @@ -69,7 +69,7 @@ func (m *generateCmd) Execute(ctx context.Context, f *flag.FlagSet, args ...inte } func (m *generateCmd) writeFile(fname, comment string, u encoding.BinaryMarshaler, mode os.FileMode) error { - fd, err := Create(fname, mode) + fd, err := create(fname, mode) if err != nil { return err } diff --git a/cmd_sign.go b/cmd_sign.go index 74398c3..e4695ee 100644 --- a/cmd_sign.go +++ b/cmd_sign.go @@ -75,7 +75,7 @@ func (m *signCmd) plain() error { } sig := sec.Sign(msg) comment := VerifyWith(m.secFile) - fd, err := Create(m.sigFile, ModeSig) + fd, err := create(m.sigFile, modeSig) if err != nil { return err } @@ -94,7 +94,7 @@ func (m *signCmd) embedded() error { } sig := sec.Sign(msg) comment := VerifyWith(m.secFile) - fd, err := Create(m.sigFile, ModeSig) + fd, err := create(m.sigFile, modeSig) if err != nil { return err } @@ -104,7 +104,7 @@ func (m *signCmd) embedded() error { // TODO func (m *signCmd) zipped() error { - fd, err := Open(m.msgFile) + fd, err := open(m.msgFile) if err != nil { return err } diff --git a/cmd_verify.go b/cmd_verify.go index 16f2e63..4636700 100644 --- a/cmd_verify.go +++ b/cmd_verify.go @@ -110,7 +110,7 @@ func (m *verifyCmd) embedded() error { // TODO ugly work-in-progress func (m *verifyCmd) zipped() error { - fd, err := Open(m.sigFile) + fd, err := open(m.sigFile) if err != nil { return err } diff --git a/files.go b/files.go index f1a432d..49f40d2 100644 --- a/files.go +++ b/files.go @@ -9,22 +9,22 @@ import ( ) const ( - ModeSec os.FileMode = 0600 - ModePub os.FileMode = 0644 - ModeSig os.FileMode = 0644 + modeSec os.FileMode = 0600 + modePub os.FileMode = 0644 + modeSig os.FileMode = 0644 ) -func Open(fname string) (*os.File, error) { +func open(fname string) (*os.File, error) { return os.OpenFile(fname, os.O_RDONLY, 0) } -func Create(fname string, perm os.FileMode) (*os.File, error) { +func create(fname string, perm os.FileMode) (*os.File, error) { return os.OpenFile(fname, os.O_WRONLY|os.O_CREATE|os.O_EXCL, perm) } func openSec(fname string) (*key.Sec, error) { sec := new(key.Sec) - fd, err := Open(fname) + fd, err := open(fname) if err != nil { return nil, err } @@ -43,7 +43,7 @@ func openSec(fname string) (*key.Sec, error) { func openPub(fname string) (*key.Pub, error) { pub := new(key.Pub) - fd, err := Open(fname) + fd, err := open(fname) if err != nil { return nil, err } @@ -59,7 +59,7 @@ func openPub(fname string) (*key.Pub, error) { func openSig(fname string) (*key.Sig, []byte, string, error) { sig := new(key.Sig) - fd, err := Open(fname) + fd, err := open(fname) if err != nil { return nil, nil, "", err } -- cgit v1.2.3