letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into enable-old-sct

This commit is contained in:
Jacob Hoffman-Andrews 2015-10-09 11:30:22 -07:00
parent 516ba44f38 35d5d44428
commit d155921a09
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/objects.go
View File

@ -741,6 +741,13 @@ type SignedCertificateTimestamp struct {
LockCol int64 LockCol int64
} }
// RPCSignedCertificateTimestamp is a wrapper around SignedCertificateTimestamp
// so that it can be passed through the RPC layer properly. Without this wrapper
// the UnmarshalJSON method below will be used when marshaling/unmarshaling the
// object, which is not what we want as it is not symmetrical (as it is intended
// to unmarshal a rawSignedCertificateTimestamp into a SignedCertificateTimestamp)
type RPCSignedCertificateTimestamp SignedCertificateTimestamp
type rawSignedCertificateTimestamp struct { type rawSignedCertificateTimestamp struct {
Version uint8 `json:"sct_version"` Version uint8 `json:"sct_version"`
LogID string `json:"id"` LogID string `json:"id"`

4
rpc/rpc-wrappers.go
View File

@ -1056,7 +1056,7 @@ func NewStorageAuthorityServer(rpc Server, impl core.StorageAuthority) error {
} }
sct, err := impl.GetSCTReceipt(gsctReq.Serial, gsctReq.LogID) sct, err := impl.GetSCTReceipt(gsctReq.Serial, gsctReq.LogID)
jsonResponse, err := json.Marshal(core.SignedCertificateTimestamp(sct)) jsonResponse, err := json.Marshal(core.RPCSignedCertificateTimestamp(sct))
if err != nil { if err != nil {
// AUDIT[ Error Conditions ] 9cc4d537-8534-4970-8665-4b382abe82f3 // AUDIT[ Error Conditions ] 9cc4d537-8534-4970-8665-4b382abe82f3
errorCondition(MethodGetSCTReceipt, err, req) errorCondition(MethodGetSCTReceipt, err, req)
@ -1067,7 +1067,7 @@ func NewStorageAuthorityServer(rpc Server, impl core.StorageAuthority) error {
}) })
rpc.Handle(MethodAddSCTReceipt, func(req []byte) (response []byte, err error) { rpc.Handle(MethodAddSCTReceipt, func(req []byte) (response []byte, err error) {
var sct core.SignedCertificateTimestamp var sct core.RPCSignedCertificateTimestamp
err = json.Unmarshal(req, &sct) err = json.Unmarshal(req, &sct)
if err != nil { if err != nil {
// AUDIT[ Improper Messages ] 0786b6f2-91ca-4f48-9883-842a19084c64 // AUDIT[ Improper Messages ] 0786b6f2-91ca-4f48-9883-842a19084c64