Merge pull request #7678 from erikarvstedt/fix-cert-key-plaintext-detection

Restore support for `PKCS8`-encoded cert private keys

docs/release-notes/release-notes-0.17.0.md

@@ -33,11 +33,14 @@
 independently](https://github.com/lightningnetwork/lnd/pull/7592) on wallet
 unlock or create.
 
+* [Restore support](https://github.com/lightningnetwork/lnd/pull/7678) for
+  `PKCS8`-encoded cert private keys.
 
 # Contributors (Alphabetical Order)
 
 * Carla Kirk-Cohen
 * Daniel McNally
 * Elle Mouton
+* Erik Arvstedt
 * hieblmi
 * Jordi Montes

tls_manager.go

@@ -35,7 +35,10 @@ const (
 
 var (
 	// privateKeyPrefix is the prefix to a plaintext TLS key.
-	privateKeyPrefix = []byte("-----BEGIN EC PRIVATE KEY-----")
+	// It should match these two key formats:
+	// - `-----BEGIN PRIVATE KEY-----`    (PKCS8).
+	// - `-----BEGIN EC PRIVATE KEY-----` (SEC1/rfc5915, the legacy format).
+	privateKeyPrefix = []byte("-----BEGIN ")
 
 	// letsEncryptTimeout sets a timeout for the Lets Encrypt server.
 	letsEncryptTimeout = 5 * time.Second