Replace ctrutil with cipherio for AES-CBC

connesc · May 26, 2020 · 646d2d5 · 646d2d5
1 parent 5a5ecda
commit 646d2d5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 102 deletions.
diff --git a/cia.go b/cia.go
@@ -10,6 +10,8 @@ import (
 	"io"
 	"io/ioutil"
 
+	"github.com/connesc/cipherio"
+
 	"github.com/connesc/ctrsigcheck/ctrutil"
 )
 
@@ -217,7 +219,7 @@ func CheckCIA(input io.Reader) (*CIA, error) {
 			}
 			contentIV := make([]byte, contentCipher.BlockSize())
 			binary.BigEndian.PutUint16(contentIV, uint16(content.Index))
-			data = ctrutil.NewCipherReader(data, cipher.NewCBCDecrypter(contentCipher, contentIV))
+			data = cipherio.NewBlockReader(data, cipher.NewCBCDecrypter(contentCipher, contentIV))
 		}
 
 		hash := sha256.New()

diff --git a/ctrutil/cipher.go b/ctrutil/cipher.go
diff --git a/go.mod b/go.mod
@@ -3,6 +3,7 @@ module github.com/connesc/ctrsigcheck
 go 1.14
 
 require (
+	github.com/connesc/cipherio v0.1.0
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.3
 )