crypto: signing builds with signify/minisign #21798
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| // Copyright 2020 The go-ethereum Authors | ||
| // This file is part of the go-ethereum library. | ||
| // | ||
| // The go-ethereum library is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU Lesser General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // The go-ethereum library is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU Lesser General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU Lesser General Public License | ||
| // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| // signFile reads the contents of an input file and signs it (in armored format) | ||
| // with the key provided, placing the signature into the output file. | ||
|
|
||
| package crypto | ||
|
|
||
| import ( | ||
| "encoding/base64" | ||
| "errors" | ||
| "fmt" | ||
| "io/ioutil" | ||
| "os" | ||
| "strings" | ||
|
|
||
| "crypto/ed25519" | ||
| ) | ||
|
|
||
| var ( | ||
| errInvalidKeyHeader = errors.New("Incorrect key header") | ||
| errInvalidKeyLength = errors.New("invalid, key length != 104") | ||
| ) | ||
|
|
||
| func readSKey(key []byte) (ed25519.PrivateKey, error) { | ||
|
There was a problem hiding this comment. Maybe you could turn this into |
||
| if len(key) != 104 { | ||
| return nil, errInvalidKeyLength | ||
| } | ||
|
|
||
| if string(key[:2]) != "Ed" { | ||
| return nil, errInvalidKeyHeader | ||
| } | ||
|
|
||
| return ed25519.PrivateKey(key[40:]), nil | ||
|
|
||
| } | ||
|
|
||
| func isCommentOnlyOneLine(comment string) bool { | ||
| firstCRIndex := strings.IndexByte(comment, 13) | ||
| firstLFIndex := strings.IndexByte(comment, 10) | ||
| return (firstCRIndex >= 0 && firstCRIndex < len(comment)-1) || (firstLFIndex >= 0 && firstLFIndex < len(comment)-1) | ||
|
There was a problem hiding this comment. Afaict, this allows arbitrarily many There was a problem hiding this comment. the code is correct, it's the function name that is wrong. It should be There was a problem hiding this comment. The go-minisign verifier does this: So it totally ignores There was a problem hiding this comment. Maybe it's not true in Go, but There was a problem hiding this comment. On unix-systems, If they allow "lalalal \r lolo \r foo bar\n" then we should do that too There was a problem hiding this comment.
this is what I said, and MacOS only uses There was a problem hiding this comment. oh right, yes, a C program in windows will require There was a problem hiding this comment.
Agreed
No, you said that There was a problem hiding this comment.
Someone doesn't refresh before posting :D There was a problem hiding this comment.
Yup, I hate that -- sometimes GH just plops in whatever new content there is, and sometimes you have to manually reload pages. Solly |
||
| } | ||
|
|
||
| // SignifySignFile creates a signature of the input file. | ||
| func SignifySignFile(input string, output string, key string, unTrustedComment string, trustedComment string) error { | ||
| in, err := os.Open(input) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer in.Close() | ||
|
|
||
| out, err := os.Create(output) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer out.Close() | ||
|
|
||
| keydata, err := base64.StdEncoding.DecodeString(key) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| skey, err := readSKey(keydata) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| filedata, err := ioutil.ReadAll(in) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| rawSig := ed25519.Sign(skey, filedata) | ||
| header := keydata[:2] | ||
| keyNum := keydata[32:40] | ||
|
|
||
| var sigdata []byte | ||
| sigdata = append(sigdata, header...) | ||
| sigdata = append(sigdata, keyNum...) | ||
| sigdata = append(sigdata, rawSig...) | ||
|
|
||
| // Check that the trusted comment fits in one line | ||
| if isCommentOnlyOneLine(unTrustedComment) { | ||
| return errors.New("untrusted comment must fit on a single line") | ||
| } | ||
|
|
||
| out.WriteString(fmt.Sprintf("untrusted comment: %s\n%s\n", unTrustedComment, base64.StdEncoding.EncodeToString(sigdata))) | ||
|
|
||
| // Add the trusted comment if available (minisign only) | ||
| if trustedComment != "" { | ||
| // Check that the trusted comment fits in one line | ||
| if isCommentOnlyOneLine(trustedComment) { | ||
| return errors.New("trusted comment must fit on a single line") | ||
| } | ||
|
|
||
| var sigAndComment []byte | ||
| sigAndComment = append(sigAndComment, rawSig...) | ||
| sigAndComment = append(sigAndComment, []byte(trustedComment)...) | ||
| out.WriteString(fmt.Sprintf("trusted comment: %s\n%s\n", trustedComment, base64.StdEncoding.EncodeToString(ed25519.Sign(skey, sigAndComment)))) | ||
gballet marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| return nil | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please fix those lines up.