weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

upgraded keystore-go to v4 and fixed code to use v4 api

Browse Source 
Signed-off-by: George Moldoveanu <mol.george@gmail.com>
This commit is contained in:
George Moldoveanu 2021-09-02 23:24:06 +01:00
parent 059e52549e
commit 155e90d175
No known key found for this signature in database
GPG Key ID: 8415987EDCD26E6E
1 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pkg/controller/certificates/internal/secretsmanager/keystore.go
View File

@ -28,10 +28,9 @@ import (
"crypto/x509"
"time"
jks "github.com/pavel-v-chernykh/keystore-go"
"software.sslmate.com/src/go-pkcs12"
"github.com/jetstack/cert-manager/pkg/util/pki"
jks "github.com/pavel-v-chernykh/keystore-go/v4"
"software.sslmate.com/src/go-pkcs12"
)
const (
@ -111,35 +110,29 @@ func encodeJKSKeystore(password []byte, rawKey []byte, certPem []byte, caPem []b
}
}
ks := jks.KeyStore{
"certificate": &jks.PrivateKeyEntry{
Entry: jks.Entry{
CreationDate: time.Now(),
},
PrivKey: keyDER,
CertChain: certs,
},
}
// add the CA certificate, if set
ks := jks.New()
ks.SetPrivateKeyEntry("certificate", jks.PrivateKeyEntry{
CreationTime: time.Now(),
PrivateKey: keyDER,
CertificateChain: certs,
}, password)
if len(caPem) > 0 {
ca, err := pki.DecodeX509CertificateBytes(caPem)
if err != nil {
return nil, err
}
ks["ca"] = &jks.TrustedCertificateEntry{
Entry: jks.Entry{
CreationDate: time.Now(),
},
ks.SetTrustedCertificateEntry("ca", jks.TrustedCertificateEntry{
CreationTime: time.Now(),
Certificate: jks.Certificate{
Type: "X509",
Content: ca.Raw,
},
}
}},
)
}
buf := &bytes.Buffer{}
if err := jks.Encode(buf, ks, password); err != nil {
if err := ks.Store(buf, password); err != nil {
return nil, err
}
return buf.Bytes(), nil
@ -151,20 +144,17 @@ func encodeJKSTruststore(password []byte, caPem []byte) ([]byte, error) {
return nil, err
}
ks := jks.KeyStore{
"ca": &jks.TrustedCertificateEntry{
Entry: jks.Entry{
CreationDate: time.Now(),
},
Certificate: jks.Certificate{
Type: "X509",
Content: ca.Raw,
},
},
}
ks := jks.New()
ks.SetTrustedCertificateEntry("ca", jks.TrustedCertificateEntry{
CreationTime: time.Now(),
Certificate: jks.Certificate{
Type: "X509",
Content: ca.Raw,
}},
)
buf := &bytes.Buffer{}
if err := jks.Encode(buf, ks, password); err != nil {
if err := ks.Store(buf, password); err != nil {
return nil, err
}
return buf.Bytes(), nil