From 4b65a6b7a8c4b3bda25487d2b04a0f2be2cabc3e Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Fri, 25 Mar 2011 12:11:27 +0100 Subject: mav60: adjust the complex tests --- package/qa/storages/TestHelper.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'package/qa') diff --git a/package/qa/storages/TestHelper.java b/package/qa/storages/TestHelper.java index 75efa4e2099b..1a67f2bfdf79 100644 --- a/package/qa/storages/TestHelper.java +++ b/package/qa/storages/TestHelper.java @@ -1434,8 +1434,8 @@ public class TestHelper { try { - byte pData[][] = new byte[1][22]; - if ( xHeadRawStream.readBytes( pData, 34 ) != 34 ) + byte pData[][] = new byte[1][38]; + if ( xHeadRawStream.readBytes( pData, 38 ) != 38 ) { Error( "Can't read header of encrypted stream '" + sStreamName + "' raw representations!" ); return false; @@ -1448,10 +1448,10 @@ public class TestHelper { } int nVariableHeaderLength = - ( pData[0][26] + pData[0][27] * 0x100 ) // salt length - + ( pData[0][28] + pData[0][29] * 0x100 ) // iv length - + ( pData[0][30] + pData[0][31] * 0x100 ) // digest length - + ( pData[0][32] + pData[0][33] * 0x100 ); // mediatype length + ( pData[0][30] + pData[0][31] * 0x100 ) // salt length + + ( pData[0][32] + pData[0][33] * 0x100 ) // iv length + + ( pData[0][34] + pData[0][35] * 0x100 ) // digest length + + ( pData[0][36] + pData[0][37] * 0x100 ); // mediatype length xHeadRawStream.skipBytes( nVariableHeaderLength ); @@ -1467,7 +1467,7 @@ public class TestHelper { if ( nRead1 != nRead2 ) { - Error( "The encrypted stream '" + sStreamName + "' raw representations have different size!" ); + Error( "The encrypted stream '" + sStreamName + "' raw representations have different size! nRead1 - nRead2 = " + ( new Integer( nRead1 - nRead2 ) ).toString() ); return false; } -- cgit