forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 09:23:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/storage: Add signature type

Browse source
This commit is contained in:
lash 2018-01-17 06:22:46 +01:00
parent 56c59d57b1
commit f482ecc6de
2 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
swarm/storage/resource.go
View file

@ -22,6 +22,17 @@ const (
indexSize = 24 indexSize = 24
) )
type Signature [signatureLength]byte
func NewSignature(b []byte) (Signature, error) {
var s Signature
if len(b) != signatureLength {
return [signatureLength]byte{}, fmt.Errorf("Must be %d bytes", signatureLength)
}
copy(s[:], b)
return s, nil
}
// Encapsulates an actual resource update. When synced it contains the most recent // Encapsulates an actual resource update. When synced it contains the most recent
// version of the resource update data. // version of the resource update data.
type resource struct { type resource struct {
@ -185,7 +196,7 @@ func NewResource(name string, startBlock uint64, frequency uint64, nameHashFunc
// Creates a new root entry for a mutable resource identified by `name` with the specified `frequency`. // Creates a new root entry for a mutable resource identified by `name` with the specified `frequency`.
// //
// The start block of the resource update will be the actual current block height of the connected network. // The start block of the resource update will be the actual current block height of the connected network.
func (self *ResourceHandler) NewResource(name string, frequency uint64, signature [signatureLength]byte) (*resource, error) { func (self *ResourceHandler) NewResource(name string, frequency uint64, signature Signature) (*resource, error) {
addr, err := self.getAddressFromDataSig([]byte(name), signature) addr, err := self.getAddressFromDataSig([]byte(name), signature)
if err != nil { if err != nil {
@ -465,7 +476,7 @@ func parseUpdate(blob []byte) (period uint32, version uint32, ensname []byte, da
// It is the caller's responsibility to make sure that this data is not stale. // It is the caller's responsibility to make sure that this data is not stale.
// //
// A resource update cannot span chunks, and thus has max length 4096 // A resource update cannot span chunks, and thus has max length 4096
func (self *ResourceHandler) Update(name string, data []byte, signature [signatureLength]byte) (Key, error) { func (self *ResourceHandler) Update(name string, data []byte, signature Signature) (Key, error) {
addr, err := self.getAddressFromDataSig(data, signature) addr, err := self.getAddressFromDataSig(data, signature)
if err != nil { if err != nil {
@ -606,9 +617,11 @@ func (self *ResourceHandler) getContentAccount(chunkdata []byte) (common.Address
if len(chunkdata) <= signatureLength { if len(chunkdata) <= signatureLength {
return common.Address{}, fmt.Errorf("zero-length data") return common.Address{}, fmt.Errorf("zero-length data")
} }
var signaturetype [signatureLength]byte signature, err := NewSignature(chunkdata[:signatureLength])
copy(signaturetype[:], chunkdata[:signatureLength]) if err != nil {
return self.getAddressFromDataSig(chunkdata[signatureLength:], signaturetype) return zeroAddr, err
}
return self.getAddressFromDataSig(chunkdata[signatureLength:], signature)
} }
func (self *ResourceHandler) getContentName(chunkdata []byte) (string, error) { func (self *ResourceHandler) getContentName(chunkdata []byte) (string, error) {
@ -622,7 +635,7 @@ func (self *ResourceHandler) getContentName(chunkdata []byte) (string, error) {
return string(namebytes), nil return string(namebytes), nil
} }
func (self *ResourceHandler) getAddressFromDataSig(data []byte, signature [signatureLength]byte) (common.Address, error) { func (self *ResourceHandler) getAddressFromDataSig(data []byte, signature Signature) (common.Address, error) {
self.hashLock.Lock() self.hashLock.Lock()
self.hasher.Reset() self.hasher.Reset()
self.hasher.Write(data) self.hasher.Write(data)

9
swarm/storage/resource_test.go
View file

@ -535,18 +535,17 @@ func setupENS(addr common.Address, transactOpts *bind.TransactOpts, sub string,
return contractAddress, contractBackend, nil return contractAddress, contractBackend, nil
} }
func signContent(privKey *ecdsa.PrivateKey, data []byte) ([signatureLength]byte, error) { func signContent(privKey *ecdsa.PrivateKey, data []byte) (Signature, error) {
hasher.Reset() hasher.Reset()
hasher.Write(data) hasher.Write(data)
datahash := hasher.Sum(nil) datahash := hasher.Sum(nil)
signature, err := crypto.Sign(datahash, privKey) signaturebytes, err := crypto.Sign(datahash, privKey)
if err != nil { if err != nil {
return [signatureLength]byte{}, err return [signatureLength]byte{}, err
} }
var signaturetype [signatureLength]byte signature, err := NewSignature(signaturebytes)
copy(signaturetype[:], signature) return signature, err
return signaturetype, nil
} }
type testCloudStore struct { type testCloudStore struct {