3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-07-24 12:08:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

options: fix overlapping certificate test (#3492)

Browse source
This commit is contained in:
Caleb Doxsey 2022-07-20 13:38:52 -06:00 • committed by GitHub
parent 250eff3e0a
commit 1afbc6e9c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 68 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pkg/cryptutil/certificates.go
View file

@ -219,7 +219,7 @@ func GenerateSelfSignedCertificate(domain string, configure ...func(*x509.Certif
return &cert, nil
}
// ParsePEMCertificate parses PEM encoded certificate block
// ParsePEMCertificate parses a PEM encoded certificate block.
func ParsePEMCertificate(raw []byte) (*x509.Certificate, error) {
data := raw
for {
@ -242,7 +242,16 @@ func ParsePEMCertificate(raw []byte) (*x509.Certificate, error) {
return nil, fmt.Errorf("no certificate block found")
}
// ParsePEMCertificateFromFile decodes PEM certificate from file
// ParsePEMCertificateFromBase64 parses a PEM encoded certificate block from a base64 encoded string.
func ParsePEMCertificateFromBase64(encoded string) (*x509.Certificate, error) {
raw, err := base64.StdEncoding.DecodeString(encoded)
if err != nil {
return nil, err
}
return ParsePEMCertificate(raw)
}
// ParsePEMCertificateFromFile decodes a PEM certificate from a file.
func ParsePEMCertificateFromFile(file string) (*x509.Certificate, error) {
fd, err := os.Open(file)
if err != nil {