aboutsummaryrefslogtreecommitdiff
path: root/file.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-04-30 13:55:40 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-04-30 13:55:40 +0200
commitcf8716e54b78c18ef4bea649451e59c1772ed937 (patch)
tree552e772a55540a6a4240494850b7fdb4a7f85b85 /file.go
parent83c3b9732f299b11d7b022014994f428f4be2f5c (diff)
...
Diffstat (limited to 'file.go')
-rw-r--r--file.go81
1 files changed, 1 insertions, 80 deletions
diff --git a/file.go b/file.go
index 9de3f95..0bc7c5d 100644
--- a/file.go
+++ b/file.go
@@ -12,92 +12,13 @@ import (
"strings"
)
-type EncFile struct {
- Comment string
- Enc *EncKey
-}
-
-func ParseEnc(r io.Reader) (*EncFile, error) {
- comment, raw, _, err := read(r)
- if err != nil {
- return nil, err
- }
- enc := new(EncKey)
- if err := Unmarshal(raw, enc); err != nil {
- return nil, err
- }
- return &EncFile{Comment: comment, Enc: enc}, nil
-}
-
-func WriteEnc(w io.Writer, enc *EncFile) error {
- raw, err := Marshal(enc.Enc)
- if err != nil {
- return err
- }
- return write(w, enc.Comment, raw, nil)
-}
-
-type PubFile struct {
- Comment string
- Pub *PubKey
-}
-
-func ParsePub(r io.Reader) (*PubFile, error) {
- comment, raw, _, err := read(r)
- if err != nil {
- return nil, err
- }
- pub := new(PubKey)
- if err := Unmarshal(raw, pub); err != nil {
- return nil, err
- }
- return &PubFile{Comment: comment, Pub: pub}, nil
-}
-
-type SigFile struct {
- Comment string
- Sig *Sig
- Message []byte
-}
-
-func WritePub(w io.Writer, pub *PubFile) error {
- raw, err := Marshal(pub.Pub)
- if err != nil {
- return err
- }
- return write(w, pub.Comment, raw, nil)
-}
-
-func ParseSig(r io.Reader) (*SigFile, error) {
- comment, raw, message, err := read(r)
- if err != nil {
- return nil, err
- }
- sig := new(Sig)
- if err := Unmarshal(raw, sig); err != nil {
- return nil, err
- }
- return &SigFile{Comment: comment, Sig: sig, Message: message}, nil
-}
-
-func WriteSig(w io.Writer, sig *SigFile) error {
- raw, err := Marshal(sig.Sig)
- if err != nil {
- return err
- }
- return write(w, sig.Comment, raw, sig.Message)
-}
-
type File struct {
Comment string
RawKey []byte
Message []byte
}
-const (
- commentHdr = "untrusted comment:"
- sigFrom = "signature from %s"
-)
+const commentHdr = "untrusted comment:"
var (
ErrCommentSize = errors.New("comment line to long")