Some name fixes.

andlabs · Sep 21, 2016 · 5bace1d · 5bace1d
1 parent ad30660
commit 5bace1d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/bridge/initio.go b/bridge/initio.go
@@ -72,7 +72,7 @@ func (ks *InitioKeySector) valid() bool {
 // into the key sector.
 const initioDEKOffset = 0x190
 
-func (ks *InitioKeySector) ExtractDEK() (dek []byte, err error) {
+func (ks *InitioKeySector) DEK() (dek []byte, err error) {
 	r := bytes.NewReader(ks.raw[initioDEKOffset:])
 	// The endianness is most likely right, but unimportant since every field is [...]byte.
 	err = binary.Read(r, binary.LittleEndian, &(ks.d))

diff --git a/bridge/jmicron.go b/bridge/jmicron.go
@@ -88,7 +88,7 @@ func (ks *JMicronKeySector) findDEK() (offset int) {
 	return -1 // not found; this isn't the right KEK
 }
 
-func (ks *JMicronKeySector) ExtractDEK() (dek []byte, err error) {
+func (ks *JMicronKeySector) DEK() (dek []byte, err error) {
 	offset := ks.findDEK()
 	if offset == -1 {
 		return nil, ErrWrongKEK

diff --git a/bridge/symwave.go b/bridge/symwave.go
@@ -63,7 +63,7 @@ func (ks *SymwaveKeySector) Raw() []byte {
 	return ks.raw
 }
 
-func (ks *SymwaveKeySector) ExtractDEK() (dek []byte, err error) {
+func (ks *SymwaveKeySector) DEK() (dek []byte, err error) {
 	r := bytes.NewReader(ks.raw)
 	// Again, stored as little endian for some reason; this is a 68000 system so it should be big endian...
 	err = binary.Read(r, binary.LittleEndian, &(ks.d))

diff --git a/disk/disk.go b/disk/disk.go
@@ -15,7 +15,7 @@ type Disk struct {
 	size	int64
 }
 
-func OpenDisk(filename string) (d *Disk, err error) {
+func Open(filename string) (d *Disk, err error) {
 	d = new(Disk)
 	d.f, err = os.Open(filename)
 	if err != nil {