Skip to content

Commit

Permalink
use pemutil. success
Browse files Browse the repository at this point in the history
  • Loading branch information
weinimo committed Sep 17, 2024
1 parent 92d3241 commit b46680b
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions pkg/octavia/amphora_certs.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"github.com/openstack-k8s-operators/lib-common/modules/common/helper"
"github.com/openstack-k8s-operators/lib-common/modules/common/secret"
octaviav1 "github.com/openstack-k8s-operators/octavia-operator/api/v1beta1"
"go.step.sm/crypto/pemutil"
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -60,12 +61,9 @@ func generateKey(passphrase []byte) (*rsa.PrivateKey, []byte, error) {

var pemBlock *pem.Block
if passphrase != nil {
pemBlock, err = EncryptPEMBlock(
rand.Reader,
"PRIVATE KEY",
pkcs8Key,
passphrase,
PEMCipherAES128)
pemBlock, err = pemutil.EncryptPKCS8PrivateKey(
rand.Reader, pkcs8Key, passphrase, pemutil.DefaultEncCipher,
)
if err != nil {
err = fmt.Errorf("Error encrypting private key: %w", err)
return priv, nil, err
Expand Down

0 comments on commit b46680b

Please sign in to comment.