Skip to content

Commit

Permalink
acceptance: comply with openssl key size restrictions
Browse files Browse the repository at this point in the history
The RSA key size used by TLS certs for acceptance tests must be at
least 2048 to please OpenSSL (which is used by libpq in tests).

The previous PR cockroachdb#71134 had improved this for some cases but the
chance was hidden in-between other things. This commit makes
it clearer what is going on.

Release note: None
  • Loading branch information
knz committed May 24, 2022
1 parent 48e48db commit 49b039f
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions pkg/acceptance/cluster/certs.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ const certsDir = ".localcluster.certs"

var absCertsDir string

// keyLen is the length (in bits) of the generated CA and node certs.
// keyLen is the length (in bits) of the generated TLS certs.
//
// This needs to be at least 2048 since the newer versions of openssl
// (used by some tests) produce an error 'ee key too small' for
// smaller values.
const keyLen = 2048

// AbsCertsDir returns the absolute path to the certificate directory.
Expand Down Expand Up @@ -54,12 +58,12 @@ func GenerateCerts(ctx context.Context) func() {
// Root user.
maybePanic(security.CreateClientPair(
certsDir, filepath.Join(certsDir, security.EmbeddedCAKey),
2048, 48*time.Hour, false, username.RootUserName(), true /* generate pk8 key */))
keyLen, 48*time.Hour, false, username.RootUserName(), true /* generate pk8 key */))

// Test user.
maybePanic(security.CreateClientPair(
certsDir, filepath.Join(certsDir, security.EmbeddedCAKey),
1024, 48*time.Hour, false, username.TestUserName(), true /* generate pk8 key */))
keyLen, 48*time.Hour, false, username.TestUserName(), true /* generate pk8 key */))

// Certs for starting a cockroach server. Key size is from cli/cert.go:defaultKeySize.
maybePanic(security.CreateNodePair(
Expand Down

0 comments on commit 49b039f

Please sign in to comment.