diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-03-23 14:13:24 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-03-23 14:13:24 +0100 |
| commit | 1decd7beffc8333d441b4327649685464e129d26 (patch) | |
| tree | b5ea5538ef1984c510bf2d4c51fdaa2d319d9e6f /package/qa | |
| parent | b92dc6c03d0876230e3e7f2daa43a3350972f0e9 (diff) | |
mav60: #164341# fix problems with the new implementation
Diffstat (limited to 'package/qa')
| -rw-r--r-- | package/qa/storages/TestHelper.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/qa/storages/TestHelper.java b/package/qa/storages/TestHelper.java index dc28786513b1..75efa4e2099b 100644 --- a/package/qa/storages/TestHelper.java +++ b/package/qa/storages/TestHelper.java @@ -1435,23 +1435,23 @@ public class TestHelper { try { byte pData[][] = new byte[1][22]; - if ( xHeadRawStream.readBytes( pData, 22 ) != 22 ) + if ( xHeadRawStream.readBytes( pData, 34 ) != 34 ) { Error( "Can't read header of encrypted stream '" + sStreamName + "' raw representations!" ); return false; } - if ( pData[0][0] != 0x4d || pData[0][1] != 0x47 || pData[0][2] != 0x02 || pData[0][3] != 0x05 ) + if ( pData[0][0] != 0x4d || pData[0][1] != 0x4d || pData[0][2] != 0x02 || pData[0][3] != 0x05 ) { Error( "No signature in the header of encrypted stream '" + sStreamName + "' raw representations!" ); return false; } int nVariableHeaderLength = - ( pData[0][14] + pData[0][15] * 0x100 ) // salt length - + ( pData[0][16] + pData[0][17] * 0x100 ) // iv length - + ( pData[0][18] + pData[0][19] * 0x100 ) // digest length - + ( pData[0][20] + pData[0][21] * 0x100 ); // mediatype length + ( 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 xHeadRawStream.skipBytes( nVariableHeaderLength ); |