OpenSSH signatures inclusion support

[meta4ra.git] / cmd / meta4-create / main.go

diff --git a/cmd/meta4-create/main.go b/cmd/meta4-create/main.go
index f5d8b5ca4c98858ea3bc6812806534c944c34ec4..bd539b9edb998c1aae365e4fab127f3e34dbb76b 100644 (file)
--- a/cmd/meta4-create/main.go
+++ b/cmd/meta4-create/main.go
@@ -36,7 +36,8 @@ func main() {
        fn := flag.String("fn", "", "Filename")
        mtime := flag.String("mtime", "", "Take that file's mtime as a Published date")
        desc := flag.String("desc", "", "Description")
-       sig := flag.String("sig", "", "Path to signature file")
+       sigPGP := flag.String("sig-pgp", "", "Path to OpenPGP .asc signature file")
+       sigSSH := flag.String("sig-ssh", "", "Path to OpenSSH .sig signature file")
        hashes := flag.String("hashes", strings.Join(meta4ra.HashesDefault, ","), "hash-name:command-s")
        torrent := flag.String("torrent", "", "Torrent URL")
        log.SetFlags(log.Lshortfile)
@@ -63,15 +64,25 @@ func main() {
                URLs:        urls,
                Hashes:      h.Sums(),
        }
-       if *sig != "" {
-               sigData, err := os.ReadFile(*sig)
+       if *sigPGP != "" {
+               sigData, err := os.ReadFile(*sigPGP)
                if err != nil {
                        log.Fatalln(err)
                }
-               f.Signature = &meta4ra.Signature{
-                       MediaType: meta4ra.GPGSigMediaType,
+               f.Signature = append(f.Signature, meta4ra.Signature{
+                       MediaType: meta4ra.SigMediaTypePGP,
                        Signature: "\n" + string(sigData),
+               })
+       }
+       if *sigSSH != "" {
+               sigData, err := os.ReadFile(*sigSSH)
+               if err != nil {
+                       log.Fatalln(err)
                }
+               f.Signature = append(f.Signature, meta4ra.Signature{
+                       MediaType: meta4ra.SigMediaTypeSSH,
+                       Signature: "\n" + string(sigData),
+               })
        }
        if *torrent != "" {
                f.MetaURLs = []meta4ra.MetaURL{{MediaType: "torrent", URL: *torrent}}