Skip to content

With cbcs 0 is valid IV length. #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
avrecko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

With cbcs 0 is valid IV length. #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions isoparser/src/main/java/org/mp4parser/boxes/iso23001/part7/AbstractSampleEncryptionBox.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ protected void getContent(ByteBuffer byteBuffer) {
IsoTypeWriter.writeUInt32(byteBuffer, getNonEmptyEntriesNum());
for (CencSampleAuxiliaryDataFormat entry : entries) {
if (entry.getSize() > 0) {
if (entry.iv.length != 8 && entry.iv.length != 16) {
throw new RuntimeException("IV must be either 8 or 16 bytes");
if (entry.iv.length != 0 && entry.iv.length != 8 && entry.iv.length != 16) {
throw new RuntimeException("IV must be either 0, 8 or 16 bytes");
}
byteBuffer.put(entry.iv);
if (isSubSampleEncryption()) {
Expand Down
5 changes: 4 additions & 1 deletion ...arser/src/main/java/org/mp4parser/boxes/iso23001/part7/CencSampleAuxiliaryDataFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ public boolean equals(Object o) {

CencSampleAuxiliaryDataFormat entry = (CencSampleAuxiliaryDataFormat) o;

if (!new BigInteger(iv).equals(new BigInteger(entry.iv))) {
BigInteger iv = this.iv.length == 0 ? BigInteger.ZERO : new BigInteger(this.iv);
BigInteger entryIv = entry.iv.length == 0 ? BigInteger.ZERO : new BigInteger(entry.iv);
if (!(iv.equals(entryIv)))
{
return false;
}
if (pairs != null ? !Arrays.equals(pairs, entry.pairs) : entry.pairs != null) {
Expand Down