qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-24 13:50:13 -07:00
Code Releases Activity

crypto/x509: expose complete DER data

Browse Source 
R=agl1
CC=golang-dev
https://golang.org/cl/4376049
This commit is contained in:
Mikkel Krautz 2011-04-11 11:20:12 -04:00 committed by Adam Langley
parent fe3dcfee27
commit e2348deeec
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pkg/crypto/x509/x509.go
View File

@ -90,6 +90,7 @@ func MarshalPKCS1PrivateKey(key *rsa.PrivateKey) []byte {
// These structures reflect the ASN.1 structure of X.509 certificates.: // These structures reflect the ASN.1 structure of X.509 certificates.:
type certificate struct { type certificate struct {
Raw asn1.RawContent
TBSCertificate tbsCertificate TBSCertificate tbsCertificate
SignatureAlgorithm algorithmIdentifier SignatureAlgorithm algorithmIdentifier
SignatureValue asn1.BitString SignatureValue asn1.BitString
@ -343,7 +344,8 @@ const (
// A Certificate represents an X.509 certificate. // A Certificate represents an X.509 certificate.
type Certificate struct { type Certificate struct {
Raw []byte // Raw ASN.1 DER contents. Raw []byte // Complete ASN.1 DER content (certificate, signature algorithm and signature).
RawTBSCertificate []byte // Certificate part of raw ASN.1 DER content.
Signature []byte Signature []byte
SignatureAlgorithm SignatureAlgorithm SignatureAlgorithm SignatureAlgorithm
@ -434,7 +436,7 @@ func (c *Certificate) CheckSignatureFrom(parent *Certificate) (err os.Error) {
return UnsupportedAlgorithmError{} return UnsupportedAlgorithmError{}
} }
h.Write(c.Raw) h.Write(c.RawTBSCertificate)
digest := h.Sum() digest := h.Sum()
return rsa.VerifyPKCS1v15(pub, hashType, digest, c.Signature) return rsa.VerifyPKCS1v15(pub, hashType, digest, c.Signature)
@ -558,7 +560,8 @@ func parsePublicKey(algo PublicKeyAlgorithm, asn1Data []byte) (interface{}, os.E
func parseCertificate(in *certificate) (*Certificate, os.Error) { func parseCertificate(in *certificate) (*Certificate, os.Error) {
out := new(Certificate) out := new(Certificate)
out.Raw = in.TBSCertificate.Raw out.Raw = in.Raw
out.RawTBSCertificate = in.TBSCertificate.Raw
out.Signature = in.SignatureValue.RightAlign() out.Signature = in.SignatureValue.RightAlign()
out.SignatureAlgorithm = out.SignatureAlgorithm =
@ -996,6 +999,7 @@ func CreateCertificate(rand io.Reader, template, parent *Certificate, pub *rsa.P
} }
cert, err = asn1.Marshal(certificate{ cert, err = asn1.Marshal(certificate{
nil,
c, c,
algorithmIdentifier{oidSHA1WithRSA}, algorithmIdentifier{oidSHA1WithRSA},
asn1.BitString{Bytes: signature, BitLength: len(signature) * 8}, asn1.BitString{Bytes: signature, BitLength: len(signature) * 8},