This fixes some issues in crypto/signify and makes release signing work. The archive signing step in ci.go used getenvBase64, which decodes the key data. This is incorrect here because crypto/signify already base64-decodes the key.
		
			
				
	
	
		
			155 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			155 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // 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 signify
 | |
| 
 | |
| import (
 | |
| 	"io/ioutil"
 | |
| 	"math/rand"
 | |
| 	"os"
 | |
| 	"testing"
 | |
| 	"time"
 | |
| 
 | |
| 	"github.com/jedisct1/go-minisign"
 | |
| )
 | |
| 
 | |
| var (
 | |
| 	testSecKey = "RWRCSwAAAABVN5lr2JViGBN8DhX3/Qb/0g0wBdsNAR/APRW2qy9Fjsfr12sK2cd3URUFis1jgzQzaoayK8x4syT4G3Gvlt9RwGIwUYIQW/0mTeI+ECHu1lv5U4Wa2YHEPIesVPyRm5M="
 | |
| 	testPubKey = "RWTAPRW2qy9FjsBiMFGCEFv9Jk3iPhAh7tZb+VOFmtmBxDyHrFT8kZuT"
 | |
| )
 | |
| 
 | |
| func TestSignify(t *testing.T) {
 | |
| 	tmpFile, err := ioutil.TempFile("", "")
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 	defer os.Remove(tmpFile.Name())
 | |
| 	defer tmpFile.Close()
 | |
| 
 | |
| 	rand.Seed(time.Now().UnixNano())
 | |
| 
 | |
| 	data := make([]byte, 1024)
 | |
| 	rand.Read(data)
 | |
| 	tmpFile.Write(data)
 | |
| 
 | |
| 	if err = tmpFile.Close(); err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 
 | |
| 	err = SignFile(tmpFile.Name(), tmpFile.Name()+".sig", testSecKey, "clé", "croissants")
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 	defer os.Remove(tmpFile.Name() + ".sig")
 | |
| 
 | |
| 	// Verify the signature using a golang library
 | |
| 	sig, err := minisign.NewSignatureFromFile(tmpFile.Name() + ".sig")
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 
 | |
| 	pKey, err := minisign.NewPublicKey(testPubKey)
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 
 | |
| 	valid, err := pKey.VerifyFromFile(tmpFile.Name(), sig)
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 	if !valid {
 | |
| 		t.Fatal("invalid signature")
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestSignifyTrustedCommentTooManyLines(t *testing.T) {
 | |
| 	tmpFile, err := ioutil.TempFile("", "")
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 	defer os.Remove(tmpFile.Name())
 | |
| 	defer tmpFile.Close()
 | |
| 
 | |
| 	rand.Seed(time.Now().UnixNano())
 | |
| 
 | |
| 	data := make([]byte, 1024)
 | |
| 	rand.Read(data)
 | |
| 	tmpFile.Write(data)
 | |
| 
 | |
| 	if err = tmpFile.Close(); err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 
 | |
| 	err = SignFile(tmpFile.Name(), tmpFile.Name()+".sig", testSecKey, "", "crois\nsants")
 | |
| 	if err == nil || err.Error() == "" {
 | |
| 		t.Fatalf("should have errored on a multi-line trusted comment, got %v", err)
 | |
| 	}
 | |
| 	defer os.Remove(tmpFile.Name() + ".sig")
 | |
| }
 | |
| 
 | |
| func TestSignifyTrustedCommentTooManyLinesLF(t *testing.T) {
 | |
| 	tmpFile, err := ioutil.TempFile("", "")
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 	defer os.Remove(tmpFile.Name())
 | |
| 	defer tmpFile.Close()
 | |
| 
 | |
| 	rand.Seed(time.Now().UnixNano())
 | |
| 
 | |
| 	data := make([]byte, 1024)
 | |
| 	rand.Read(data)
 | |
| 	tmpFile.Write(data)
 | |
| 
 | |
| 	if err = tmpFile.Close(); err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 
 | |
| 	err = SignFile(tmpFile.Name(), tmpFile.Name()+".sig", testSecKey, "crois\rsants", "")
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 	defer os.Remove(tmpFile.Name() + ".sig")
 | |
| }
 | |
| 
 | |
| func TestSignifyTrustedCommentEmpty(t *testing.T) {
 | |
| 	tmpFile, err := ioutil.TempFile("", "")
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 	defer os.Remove(tmpFile.Name())
 | |
| 	defer tmpFile.Close()
 | |
| 
 | |
| 	rand.Seed(time.Now().UnixNano())
 | |
| 
 | |
| 	data := make([]byte, 1024)
 | |
| 	rand.Read(data)
 | |
| 	tmpFile.Write(data)
 | |
| 
 | |
| 	if err = tmpFile.Close(); err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 
 | |
| 	err = SignFile(tmpFile.Name(), tmpFile.Name()+".sig", testSecKey, "", "")
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 	defer os.Remove(tmpFile.Name() + ".sig")
 | |
| }
 |