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

Merge pull request #3862 from jetstack/revert-3847-fix/3619

Browse Source 
Revert "Handle CA issuer working as intermediate correctly"
This commit is contained in:
jetstack-bot 2021-04-07 09:46:57 +01:00 committed by GitHub
commit 9f612f0c2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,6 +1,5 @@
.DS_Store
.idea
*.iml
/acmesolver
/controller
/ingress-shim

7
pkg/util/pki/csr.go
View File

@ -424,9 +424,9 @@ func SignCSRTemplate(caCerts []*x509.Certificate, caKey crypto.Signer, template
return nil, nil, errors.New("no CA certificates given to sign CSR template")
}
issuingCACert := caCerts[0]
caCert := caCerts[0]
certPem, _, err := SignCertificate(template, issuingCACert, template.PublicKey, caKey)
certPem, _, err := SignCertificate(template, caCert, template.PublicKey, caKey)
if err != nil {
return nil, nil, err
@ -440,8 +440,7 @@ func SignCSRTemplate(caCerts []*x509.Certificate, caKey crypto.Signer, template
certPem = append(certPem, chainPem...)
// encode the CA certificate to be bundled in the output
caCert := caCerts[len(caCerts)-1]
caPem, err := EncodeX509(caCert)
caPem, err := EncodeX509(caCerts[0])
if err != nil {
return nil, nil, err
}