Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

webtransport: tidy up some test output #2053

Merged
merged 1 commit into from
Feb 7, 2023
Merged

webtransport: tidy up some test output #2053

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
90 changes: 43 additions & 47 deletions p2p/transport/webtransport/crypto_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,25 +138,23 @@ func TestDeterministicCertHashes(t *testing.T) {
// Run this test 1000 times since we want to make sure the signatures are deterministic
runs := 1000
for i := 0; i < runs; i++ {
t.Run(fmt.Sprintf("Run=%d", i), func(t *testing.T) {
zeroSeed := [32]byte{}
priv, _, err := ic.GenerateEd25519Key(bytes.NewReader(zeroSeed[:]))
require.NoError(t, err)
cert, certPriv, err := generateCert(priv, time.Time{}, time.Time{}.Add(time.Hour*24*14))
require.NoError(t, err)

keyBytes, err := x509.MarshalECPrivateKey(certPriv)
require.NoError(t, err)

cert2, certPriv2, err := generateCert(priv, time.Time{}, time.Time{}.Add(time.Hour*24*14))
require.NoError(t, err)

require.Equal(t, cert2.Signature, cert.Signature)
require.Equal(t, cert2.Raw, cert.Raw)
keyBytes2, err := x509.MarshalECPrivateKey(certPriv2)
require.NoError(t, err)
require.Equal(t, keyBytes, keyBytes2)
})
zeroSeed := [32]byte{}
priv, _, err := ic.GenerateEd25519Key(bytes.NewReader(zeroSeed[:]))
require.NoError(t, err)
cert, certPriv, err := generateCert(priv, time.Time{}, time.Time{}.Add(time.Hour*24*14))
require.NoError(t, err)

keyBytes, err := x509.MarshalECPrivateKey(certPriv)
require.NoError(t, err)

cert2, certPriv2, err := generateCert(priv, time.Time{}, time.Time{}.Add(time.Hour*24*14))
require.NoError(t, err)

require.Equal(t, cert2.Signature, cert.Signature)
require.Equal(t, cert2.Raw, cert.Raw)
keyBytes2, err := x509.MarshalECPrivateKey(certPriv2)
require.NoError(t, err)
require.Equal(t, keyBytes, keyBytes2)
}
}

Expand All @@ -168,33 +166,31 @@ func TestDeterministicSig(t *testing.T) {
// Run this test 1000 times since we want to make sure the signatures are deterministic
runs := 1000
for i := 0; i < runs; i++ {
t.Run(fmt.Sprintf("Run=%d", i), func(t *testing.T) {
zeroSeed := [32]byte{}
deterministicHKDFReader := newDeterministicReader(zeroSeed[:], nil, deterministicCertInfo)
b := [1024]byte{}
io.ReadFull(deterministicHKDFReader, b[:])
caPrivateKey, err := ecdsa.GenerateKey(elliptic.P256(), deterministicHKDFReader)
require.NoError(t, err)

sig, err := caPrivateKey.Sign(deterministicHKDFReader, b[:], crypto.SHA256)
require.NoError(t, err)

deterministicHKDFReader = newDeterministicReader(zeroSeed[:], nil, deterministicCertInfo)
b2 := [1024]byte{}
io.ReadFull(deterministicHKDFReader, b2[:])
caPrivateKey2, err := ecdsa.GenerateKey(elliptic.P256(), deterministicHKDFReader)
require.NoError(t, err)

sig2, err := caPrivateKey2.Sign(deterministicHKDFReader, b2[:], crypto.SHA256)
require.NoError(t, err)

keyBytes, err := x509.MarshalECPrivateKey(caPrivateKey)
require.NoError(t, err)
keyBytes2, err := x509.MarshalECPrivateKey(caPrivateKey2)
require.NoError(t, err)

require.Equal(t, sig, sig2)
require.Equal(t, keyBytes, keyBytes2)
})
zeroSeed := [32]byte{}
deterministicHKDFReader := newDeterministicReader(zeroSeed[:], nil, deterministicCertInfo)
b := [1024]byte{}
io.ReadFull(deterministicHKDFReader, b[:])
caPrivateKey, err := ecdsa.GenerateKey(elliptic.P256(), deterministicHKDFReader)
require.NoError(t, err)

sig, err := caPrivateKey.Sign(deterministicHKDFReader, b[:], crypto.SHA256)
require.NoError(t, err)

deterministicHKDFReader = newDeterministicReader(zeroSeed[:], nil, deterministicCertInfo)
b2 := [1024]byte{}
io.ReadFull(deterministicHKDFReader, b2[:])
caPrivateKey2, err := ecdsa.GenerateKey(elliptic.P256(), deterministicHKDFReader)
require.NoError(t, err)

sig2, err := caPrivateKey2.Sign(deterministicHKDFReader, b2[:], crypto.SHA256)
require.NoError(t, err)

keyBytes, err := x509.MarshalECPrivateKey(caPrivateKey)
require.NoError(t, err)
keyBytes2, err := x509.MarshalECPrivateKey(caPrivateKey2)
require.NoError(t, err)

require.Equal(t, sig, sig2)
require.Equal(t, keyBytes, keyBytes2)
}
}