luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #9722 from hashicorp/dnephin/fix-master-build 

Fix main build failing
This commit is contained in:
Daniel Nephin 2021-02-05 18:13:13 -05:00 committed by GitHub
parent 3ed3380101 c312e0fd35
commit df0f93f850
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tlsutil/generate_test.go
View File

@ -13,8 +13,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/stretchr/testify/require"
"strings" "strings"
"github.com/stretchr/testify/require"
) )
func TestSerialNumber(t *testing.T) { func TestSerialNumber(t *testing.T) {
@ -91,15 +92,15 @@ func TestGenerateCA(t *testing.T) {
require.Equal(t, x509.KeyUsageCertSign|x509.KeyUsageCRLSign|x509.KeyUsageDigitalSignature, cert.KeyUsage) require.Equal(t, x509.KeyUsageCertSign|x509.KeyUsageCRLSign|x509.KeyUsageDigitalSignature, cert.KeyUsage)
// Test what happens with a correct RSA Key // Test what happens with a correct RSA Key
s, err = rsa.GenerateKey(rand.Reader, 2048) s, err := rsa.GenerateKey(rand.Reader, 2048)
require.Nil(t, err)
ca, err = GenerateCA(s, sn, 365, nil)
require.Nil(t, err) require.Nil(t, err)
ca, _, err = GenerateCA(CAOpts{Signer: &TestSigner{public: s.Public()}})
require.NoError(t, err)
require.NotEmpty(t, ca) require.NotEmpty(t, ca)
cert, err = parseCert(ca) cert, err = parseCert(ca)
require.Nil(t, err) require.NoError(t, err)
require.Equal(t, fmt.Sprintf("Consul Agent CA %d", sn), cert.Subject.CommonName) require.True(t, strings.HasPrefix(cert.Subject.CommonName, "Consul Agent CA"))
require.Equal(t, true, cert.IsCA) require.Equal(t, true, cert.IsCA)
require.Equal(t, true, cert.BasicConstraintsValid) require.Equal(t, true, cert.BasicConstraintsValid)
@ -107,7 +108,6 @@ func TestGenerateCA(t *testing.T) {
require.WithinDuration(t, cert.NotAfter, time.Now().AddDate(0, 0, 365), time.Minute) require.WithinDuration(t, cert.NotAfter, time.Now().AddDate(0, 0, 365), time.Minute)
require.Equal(t, x509.KeyUsageCertSign|x509.KeyUsageCRLSign|x509.KeyUsageDigitalSignature, cert.KeyUsage) require.Equal(t, x509.KeyUsageCertSign|x509.KeyUsageCRLSign|x509.KeyUsageDigitalSignature, cert.KeyUsage)
} }
func TestGenerateCert(t *testing.T) { func TestGenerateCert(t *testing.T) {