mbiryukova/lego
1
0
Fork 0
forked from TrueCloudLab/lego
Code Pull requests Activity

Wrap []byte for DER certificates in its own type.

Browse source
This commit is contained in:
xenolf 2015-10-18 03:29:26 +02:00
parent 141900789d
commit 7f6f790253
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
acme/client.go
View file

@ -357,7 +357,7 @@ func (c *Client) requestCertificate(authz *authorizationResource, result chan Ce
// Otherwise the body is the certificate. // Otherwise the body is the certificate.
if len(cert) > 0 { if len(cert) > 0 {
cerRes.CertStableURL = resp.Header.Get("Content-Location") cerRes.CertStableURL = resp.Header.Get("Content-Location")
cerRes.Certificate = pemEncode(cert) cerRes.Certificate = pemEncode(derCertificateBytes(cert))
result <- cerRes result <- cerRes
} else { } else {
// The certificate was granted but is not yet issued. // The certificate was granted but is not yet issued.

4
acme/crypto.go
View file

@ -10,6 +10,8 @@ import (
"time" "time"
) )
type derCertificateBytes []byte
func generatePrivateKey(keyLength int) (*rsa.PrivateKey, error) { func generatePrivateKey(keyLength int) (*rsa.PrivateKey, error) {
return rsa.GenerateKey(rand.Reader, keyLength) return rsa.GenerateKey(rand.Reader, keyLength)
} }
@ -30,7 +32,7 @@ func pemEncode(data interface{}) []byte {
case *rsa.PrivateKey: case *rsa.PrivateKey:
pemBlock = &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(key)} pemBlock = &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(key)}
break break
case []byte: case derCertificateBytes:
pemBlock = &pem.Block{Type: "CERTIFICATE", Bytes: data.([]byte)} pemBlock = &pem.Block{Type: "CERTIFICATE", Bytes: data.([]byte)}
} }