Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-11457 Increment HFile block encoding IVs accounting for cipher's internal use

This commit is contained in:
Andrew Purtell 2014-07-04 10:45:32 -07:00
parent 0b692dfd5a
commit f36bf219ec
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/HFileBlockDefaultEncodingContext.java
View File

@ -187,7 +187,6 @@ public class HFileBlockDefaultEncodingContext implements
Preconditions.checkState(ivLength <= Byte.MAX_VALUE, "IV length out of range"); Preconditions.checkState(ivLength <= Byte.MAX_VALUE, "IV length out of range");
cryptoByteStream.write(ivLength); cryptoByteStream.write(ivLength);
if (ivLength > 0) { if (ivLength > 0) {
Encryption.incrementIv(iv);
encryptor.setIv(iv); encryptor.setIv(iv);
cryptoByteStream.write(iv); cryptoByteStream.write(iv);
} }
@ -197,6 +196,9 @@ public class HFileBlockDefaultEncodingContext implements
onDiskBytesWithHeader = cryptoByteStream.toByteArray(); onDiskBytesWithHeader = cryptoByteStream.toByteArray();
// Increment the IV given the final block size
Encryption.incrementIv(iv, 1 + (onDiskBytesWithHeader.length / encryptor.getBlockSize()));
} else { } else {
cryptoByteStream.write(0); cryptoByteStream.write(0);