More LeaseSet building fixes

This commit is contained in:
idk
2021-05-18 09:06:54 -04:00
parent 82ba9c1b68
commit 4a9943de9b
4 changed files with 8 additions and 8 deletions

View File

@ -7,9 +7,9 @@ Accurate for version 0.9.24
*/ */
import ( import (
"time"
"errors" "errors"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"time"
) )
type Date [8]byte type Date [8]byte
@ -37,7 +37,7 @@ func ReadDate(data []byte) (h Date, remainder []byte, err error) {
}).Error("date error") }).Error("date error")
err = errors.New("error reading date, insufficient length") err = errors.New("error reading date, insufficient length")
copy(h[:], data[0:len(data)-1]) copy(h[:], data[0:len(data)-1])
}else{ } else {
copy(h[:], data[0:DATE_SIZE-1]) copy(h[:], data[0:DATE_SIZE-1])
copy(remainder, data[DATE_SIZE-1:]) copy(remainder, data[DATE_SIZE-1:])
} }

View File

@ -40,7 +40,7 @@ func ReadHash(data []byte) (h Hash, remainder []byte, err error) {
}).Error("hash error") }).Error("hash error")
err = errors.New("error reading hash, insufficient length") err = errors.New("error reading hash, insufficient length")
copy(h[:], data[0:len(data)-1]) copy(h[:], data[0:len(data)-1])
}else{ } else {
copy(h[:], data[0:HASH_SIZE-1]) copy(h[:], data[0:HASH_SIZE-1])
copy(remainder, data[HASH_SIZE-1:]) copy(remainder, data[HASH_SIZE-1:])
} }

View File

@ -25,7 +25,7 @@ func ReadIdent(data []byte) (h Ident, remainder []byte, err error) {
}).Error("ident error") }).Error("ident error")
err = errors.New("error reading ident, insufficient length") err = errors.New("error reading ident, insufficient length")
copy(h[:], data[0:len(data)-1]) copy(h[:], data[0:len(data)-1])
}else{ } else {
copy(h[:], data[0:IDENT_SIZE-1]) copy(h[:], data[0:IDENT_SIZE-1])
copy(remainder, data[IDENT_SIZE-1:]) copy(remainder, data[IDENT_SIZE-1:])
} }

View File

@ -325,7 +325,7 @@ func ReadLeases(bytes []byte) (leases []Lease, remainder []byte, err error) {
return return
} }
func ReadLeaseSetKeys(data []byte, cert CertificateInterface) (spk crypto.SigningPublicKey,pk crypto.ElgPublicKey, remainder []byte, err error){ func ReadLeaseSetKeys(data []byte, cert CertificateInterface) (spk crypto.SigningPublicKey, pk crypto.ElgPublicKey, remainder []byte, err error) {
spk, ppk, remainder, err := ReadKeys(data, cert) spk, ppk, remainder, err := ReadKeys(data, cert)
switch ppk.(type) { switch ppk.(type) {
case crypto.ElgPublicKey: case crypto.ElgPublicKey: