filterdetect.cxx (506fa58b) filterdetect.cxx (604463aa)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 344 unchanged lines hidden (view full) ---

353 {
354 // open the required input streams in the encrypted package
355 Reference< XInputStream > xEncryptionInfo( aOleStorage.openInputStream( CREATE_OUSTRING( "EncryptionInfo" ) ), UNO_SET_THROW );
356 Reference< XInputStream > xEncryptedPackage( aOleStorage.openInputStream( CREATE_OUSTRING( "EncryptedPackage" ) ), UNO_SET_THROW );
357
358 // read the encryption info stream
359 ::boost::shared_ptr< EncryptionInfo > encryptionInfo( EncryptionInfo::readEncryptionInfo( mxContext, xEncryptionInfo ) );
360
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 344 unchanged lines hidden (view full) ---

353 {
354 // open the required input streams in the encrypted package
355 Reference< XInputStream > xEncryptionInfo( aOleStorage.openInputStream( CREATE_OUSTRING( "EncryptionInfo" ) ), UNO_SET_THROW );
356 Reference< XInputStream > xEncryptedPackage( aOleStorage.openInputStream( CREATE_OUSTRING( "EncryptedPackage" ) ), UNO_SET_THROW );
357
358 // read the encryption info stream
359 ::boost::shared_ptr< EncryptionInfo > encryptionInfo( EncryptionInfo::readEncryptionInfo( mxContext, xEncryptionInfo ) );
360
361 // check flags and agorithm IDs, requiered are AES128 and SHA-1
361 // check flags and algorithm IDs, required are AES128 and SHA-1
362 bool bImplemented = encryptionInfo->isImplemented();
363 if( bImplemented )
364 {
365 /* "VelvetSweatshop" is the built-in default encryption
366 password used by MS Excel for the "workbook protection"
367 feature with password. Try this first before prompting the
368 user for a password. */
369 ::std::vector< OUString > aDefaultPasswords;

--- 117 unchanged lines hidden --- 		362 bool bImplemented = encryptionInfo->isImplemented();
363 if( bImplemented )
364 {
365 /* "VelvetSweatshop" is the built-in default encryption
366 password used by MS Excel for the "workbook protection"
367 feature with password. Try this first before prompting the
368 user for a password. */
369 ::std::vector< OUString > aDefaultPasswords;

--- 117 unchanged lines hidden ---