From b8dfb9cc4d5133e0f09cd7533d15a4f1c19a40f2 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Thu, 23 Sep 2010 22:27:59 +0200 Subject: [PATCH] Add support for gzip compressed databases. --- CMakeLists.txt | 2 + COPYING | 4 + LICENSE.LGPL | 502 ++++++++++++++++++++++++++ LICENSE.NOKIA-LGPL-EXCEPTION | 23 ++ src/CMakeLists.txt | 3 +- src/format/KeePass2Reader.cpp | 20 +- src/format/KeePass2Reader.h | 3 +- src/streams/QtIOCompressor | 1 + src/streams/qtiocompressor.cpp | 624 +++++++++++++++++++++++++++++++++ src/streams/qtiocompressor.h | 94 +++++ tests/CMakeLists.txt | 12 +- tests/Compressed.kdbx | Bin 0 -> 1870 bytes tests/TestKeePass2Reader.cpp | 13 + 13 files changed, 1290 insertions(+), 11 deletions(-) create mode 100644 LICENSE.LGPL create mode 100644 LICENSE.NOKIA-LGPL-EXCEPTION create mode 100644 src/streams/QtIOCompressor create mode 100644 src/streams/qtiocompressor.cpp create mode 100644 src/streams/qtiocompressor.h create mode 100644 tests/Compressed.kdbx diff --git a/CMakeLists.txt b/CMakeLists.txt index d3afb5273..40636f052 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,6 +49,8 @@ find_package(Automoc4 REQUIRED) find_package(Libgcrypt REQUIRED) +find_package(ZLIB REQUIRED) + add_subdirectory(src) if( WITH_TESTS ) add_subdirectory(tests) diff --git a/COPYING b/COPYING index b610dcc60..193f5d84c 100644 --- a/COPYING +++ b/COPYING @@ -30,6 +30,10 @@ Files: share/icons/entries/*.png Copyright: 2003-2004, David Vignoni License: LGPL-2.1 +Files: src/streams/qtiocompressor.*, src/streams/QtIOCompressor +Copyright: 2009, Nokia Corporation and/or its subsidiary(-ies) +License: LGPL-2.1 or GPL-3 + Files: tests/modeltest.* Copyright: 2007, Trolltech ASA License: GPL-2 diff --git a/LICENSE.LGPL b/LICENSE.LGPL new file mode 100644 index 000000000..e5ab03e12 --- /dev/null +++ b/LICENSE.LGPL @@ -0,0 +1,502 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/LICENSE.NOKIA-LGPL-EXCEPTION b/LICENSE.NOKIA-LGPL-EXCEPTION new file mode 100644 index 000000000..022ddd1e3 --- /dev/null +++ b/LICENSE.NOKIA-LGPL-EXCEPTION @@ -0,0 +1,23 @@ +Nokia Qt LGPL Exception version 1.1 + +As an additional permission to the GNU Lesser General Public License +version 2.1, the object code form of a "work that uses the Library" +may incorporate material from a header file that is part of the +Library. You may distribute such object code under terms of your +choice, provided that: +(i) the header files of the Library have not been modified; and +(ii) the incorporated material is limited to numerical parameters, +data structure layouts, accessors, macros, inline functions and +templates; and +(iii) you comply with the terms of Section 6 of the GNU +Lesser General Public License version 2.1. + +Moreover, you may apply this exception to a modified version of the +Library, provided that such modification does not involve copying +material from the Library into the modified Library?s header files +unless such material is limited to (i) numerical parameters; (ii) data +structure layouts; (iii) accessors; and (iv) small macros, templates +and inline functions of five lines or less in length. + +Furthermore, you are not required to apply this additional permission +to a modified version of the Library. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 771b8b5ce..367696c3e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -43,6 +43,7 @@ set(keepassx_SOURCES keys/PasswordKey.cpp streams/HashedBlockStream.cpp streams/LayeredStream.cpp + streams/qtiocompressor.cpp streams/SymmetricCipherStream.cpp ) @@ -55,4 +56,4 @@ qt4_wrap_ui(keepassx_SOURCES ${keepassx_FORMS}) automoc4_add_library( keepassx_core STATIC ${keepassx_SOURCES} ) automoc4_add_executable( ${PROGNAME} WIN32 MACOSX_BUNDLE main.cpp ) -target_link_libraries( ${PROGNAME} keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${LIBGCRYPT_LIBS} ) +target_link_libraries( ${PROGNAME} keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${LIBGCRYPT_LIBS} ${ZLIB_LIBRARIES} ) diff --git a/src/format/KeePass2Reader.cpp b/src/format/KeePass2Reader.cpp index d38b433e7..13df6b97d 100644 --- a/src/format/KeePass2Reader.cpp +++ b/src/format/KeePass2Reader.cpp @@ -21,10 +21,10 @@ #include #include -#include "KeePass2.h" #include "KeePass2XmlReader.h" #include "crypto/CryptoHash.h" #include "streams/HashedBlockStream.h" +#include "streams/QtIOCompressor" #include "streams/SymmetricCipherStream.h" const QSysInfo::Endian KeePass2Reader::BYTEORDER = QSysInfo::LittleEndian; @@ -80,8 +80,22 @@ Database* KeePass2Reader::readDatabase(QIODevice* device, const CompositeKey& ke HashedBlockStream hashedStream(&cipherStream); hashedStream.open(QIODevice::ReadOnly); + QIODevice* xmlDevice; + QScopedPointer ioCompressor; + + if (m_compression == KeePass2::CompressionNone) { + xmlDevice = &hashedStream; + } + else { + ioCompressor.reset(new QtIOCompressor(&hashedStream)); + ioCompressor->setStreamFormat(QtIOCompressor::GzipFormat); + ioCompressor->open(QIODevice::ReadOnly); + xmlDevice = ioCompressor.data(); + } + KeePass2XmlReader xmlReader; - Database* db = xmlReader.readDatabase(&hashedStream); + Database* db = xmlReader.readDatabase(xmlDevice); + // TODO forward error messages from xmlReader return db; } @@ -208,7 +222,7 @@ void KeePass2Reader::setCompressionFlags(const QByteArray& data) raiseError(""); } else { - m_compression = id; + m_compression = static_cast(id); } } } diff --git a/src/format/KeePass2Reader.h b/src/format/KeePass2Reader.h index 396348036..e839fcaa8 100644 --- a/src/format/KeePass2Reader.h +++ b/src/format/KeePass2Reader.h @@ -23,6 +23,7 @@ #include "core/Endian.h" #include "core/Uuid.h" #include "keys/CompositeKey.h" +#include "format/KeePass2.h" class Database; @@ -59,7 +60,7 @@ private: bool m_headerEnd; Uuid m_cipher; - int m_compression; + KeePass2::CompressionAlgorithm m_compression; QByteArray m_masterSeed; QByteArray m_transformSeed; quint64 m_transformRounds; diff --git a/src/streams/QtIOCompressor b/src/streams/QtIOCompressor new file mode 100644 index 000000000..350ed4b02 --- /dev/null +++ b/src/streams/QtIOCompressor @@ -0,0 +1 @@ +#include "qtiocompressor.h" diff --git a/src/streams/qtiocompressor.cpp b/src/streams/qtiocompressor.cpp new file mode 100644 index 000000000..0de5dff4d --- /dev/null +++ b/src/streams/qtiocompressor.cpp @@ -0,0 +1,624 @@ +/**************************************************************************** +** +** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of a Qt Solutions component. +** +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Solutions Commercial License Agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and Nokia. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.1, included in the file LICENSE.NOKIA-LGPL-EXCEPTION +** in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL-3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** Please note Third Party Software included with Qt Solutions may impose +** additional restrictions and it is the user's responsibility to ensure +** that they have met the licensing requirements of the GPL, LGPL, or Qt +** Solutions Commercial license and the relevant license of the Third +** Party Software they are using. +** +** If you are unsure which license is appropriate for your use, please +** contact Nokia at qt-info@nokia.com. +** +****************************************************************************/ + +#include "qtiocompressor.h" +#include "zlib.h" +#include + +typedef Bytef ZlibByte; +typedef uInt ZlibSize; + +class QtIOCompressorPrivate { + QtIOCompressor *q_ptr; + Q_DECLARE_PUBLIC(QtIOCompressor) +public: + enum State { + // Read state + NotReadFirstByte, + InStream, + EndOfStream, + // Write state + NoBytesWritten, + BytesWritten, + // Common + Closed, + Error + }; + + QtIOCompressorPrivate(QtIOCompressor *q_ptr, QIODevice *device, int compressionLevel, int bufferSize); + ~QtIOCompressorPrivate(); + void flushZlib(int flushMode); + bool writeBytes(ZlibByte *buffer, ZlibSize outputSize); + void setZlibError(const QString &erroMessage, int zlibErrorCode); + + QIODevice *device; + bool manageDevice; + z_stream zlibStream; + const int compressionLevel; + const ZlibSize bufferSize; + ZlibByte *buffer; + State state; + QtIOCompressor::StreamFormat streamFormat; +}; + +/*! + \internal +*/ +QtIOCompressorPrivate::QtIOCompressorPrivate(QtIOCompressor *q_ptr, QIODevice *device, int compressionLevel, int bufferSize) +:q_ptr(q_ptr) +,device(device) +,compressionLevel(compressionLevel) +,bufferSize(bufferSize) +,buffer(new ZlibByte[bufferSize]) +,state(Closed) +,streamFormat(QtIOCompressor::ZlibFormat) +{ + // Use default zlib memory management. + zlibStream.zalloc = Z_NULL; + zlibStream.zfree = Z_NULL; + zlibStream.opaque = Z_NULL; +} + +/*! + \internal +*/ +QtIOCompressorPrivate::~QtIOCompressorPrivate() +{ + delete[] buffer; +} + +/*! + \internal + Flushes the zlib stream. +*/ +void QtIOCompressorPrivate::flushZlib(int flushMode) +{ + // No input. + zlibStream.next_in = 0; + zlibStream.avail_in = 0; + int status; + do { + zlibStream.next_out = buffer; + zlibStream.avail_out = bufferSize; + status = deflate(&zlibStream, flushMode); + if (status != Z_OK && status != Z_STREAM_END) { + state = QtIOCompressorPrivate::Error; + setZlibError(QT_TRANSLATE_NOOP("QtIOCompressor", "Internal zlib error when compressing: "), status); + return; + } + + ZlibSize outputSize = bufferSize - zlibStream.avail_out; + + // Try to write data from the buffer to to the underlying device, return on failure. + if (!writeBytes(buffer, outputSize)) + return; + + // If the mode is Z_FNISH we must loop until we get Z_STREAM_END, + // else we loop as long as zlib is able to fill the output buffer. + } while ((flushMode == Z_FINISH && status != Z_STREAM_END) || (flushMode != Z_FINISH && zlibStream.avail_out == 0)); + + if (flushMode == Z_FINISH) + Q_ASSERT(status == Z_STREAM_END); + else + Q_ASSERT(status == Z_OK); +} + +/*! + \internal + Writes outputSize bytes from buffer to the inderlying device. +*/ +bool QtIOCompressorPrivate::writeBytes(ZlibByte *buffer, ZlibSize outputSize) +{ + Q_Q(QtIOCompressor); + ZlibSize totalBytesWritten = 0; + // Loop until all bytes are written to the underlying device. + do { + const qint64 bytesWritten = device->write(reinterpret_cast(buffer), outputSize); + if (bytesWritten == -1) { + q->setErrorString(QT_TRANSLATE_NOOP("QtIOCompressor", "Error writing to underlying device: ") + device->errorString()); + return false; + } + totalBytesWritten += bytesWritten; + } while (totalBytesWritten != outputSize); + + // put up a flag so that the device will be flushed on close. + state = BytesWritten; + return true; +} + +/*! + \internal + Sets the error string to errorMessage + zlib error string for zlibErrorCode +*/ +void QtIOCompressorPrivate::setZlibError(const QString &errorMessage, int zlibErrorCode) +{ + Q_Q(QtIOCompressor); + // Watch out, zlibErrorString may be null. + const char * const zlibErrorString = zError(zlibErrorCode); + QString errorString; + if (zlibErrorString) + errorString = errorMessage + zlibErrorString; + else + errorString = errorMessage + " Unknown error, code " + QString::number(zlibErrorCode); + + q->setErrorString(errorString); +} + +/*! \class QtIOCompressor + \brief The QtIOCompressor class is a QIODevice that compresses data streams. + + A QtIOCompressor object is constructed with a pointer to an + underlying QIODevice. Data written to the QtIOCompressor object + will be compressed before it is written to the underlying + QIODevice. Similary, if you read from the QtIOCompressor object, + the data will be read from the underlying device and then + decompressed. + + QtIOCompressor is a sequential device, which means that it does + not support seeks or random access. Internally, QtIOCompressor + uses the zlib library to compress and uncompress data. + + Usage examples: + Writing compressed data to a file: + \code + QFile file("foo"); + QtIOCompressor compressor(&file); + compressor.open(QIODevice::WriteOnly); + compressor.write(QByteArray() << "The quick brown fox"); + compressor.close(); + \endcode + + Reading compressed data from a file: + \code + QFile file("foo"); + QtIOCompressor compressor(&file); + compressor.open(QIODevice::ReadOnly); + const QByteArray text = compressor.readAll(); + compressor.close(); + \endcode + + QtIOCompressor can also read and write compressed data in + different compressed formats, ref. StreamFormat. Use + setStreamFormat() before open() to select format. +*/ + +/*! + \enum QtIOCompressor::StreamFormat + This enum specifies which stream format to use. + + \value ZlibFormat: This is the default and has the smallest overhead. + + \value GzipFormat: This format is compatible with the gzip file + format, but has more overhead than ZlibFormat. Note: requires zlib + version 1.2.x or higher at runtime. + + \value RawZipFormat: This is compatible with the most common + compression method of the data blocks contained in ZIP + archives. Note: ZIP file headers are not read or generated, so + setting this format, by itself, does not let QtIOCompressor read + or write ZIP files. Ref. the ziplist example program. + + \sa setStreamFormat() +*/ + +/*! + Constructs a QtIOCompressor using the given \a device as the underlying device. + + The allowed value range for \a compressionLevel is 0 to 9, where 0 means no compression + and 9 means maximum compression. The default value is 6. + + \a bufferSize specifies the size of the internal buffer used when reading from and writing to the + underlying device. The default value is 65KB. Using a larger value allows for faster compression and + deompression at the expense of memory usage. +*/ +QtIOCompressor::QtIOCompressor(QIODevice *device, int compressionLevel, int bufferSize) +:d_ptr(new QtIOCompressorPrivate(this, device, compressionLevel, bufferSize)) +{} + +/*! + Destroys the QtIOCompressor, closing it if neccesary. +*/ +QtIOCompressor::~QtIOCompressor() +{ + Q_D(QtIOCompressor); + close(); + delete d; +} + +/*! + Sets the format on the compressed stream to \a format. + + \sa QtIOCompressor::StreamFormat +*/ +void QtIOCompressor::setStreamFormat(StreamFormat format) +{ + Q_D(QtIOCompressor); + + // Print a waning if the compile-time version of zlib does not support gzip. + if (format == GzipFormat && checkGzipSupport(ZLIB_VERSION) == false) + qWarning("QtIOCompressor::setStreamFormat: zlib 1.2.x or higher is " + "required to use the gzip format. Current version is: %s", + ZLIB_VERSION); + + d->streamFormat = format; +} + +/*! + Returns the format set on the compressed stream. + \sa QtIOCompressor::StreamFormat +*/ +QtIOCompressor::StreamFormat QtIOCompressor::streamFormat() const +{ + Q_D(const QtIOCompressor); + return d->streamFormat; +} + +/*! + Returns true if the zlib library in use supports the gzip format, false otherwise. +*/ +bool QtIOCompressor::isGzipSupported() +{ + return checkGzipSupport(zlibVersion()); +} + +/*! + \reimp +*/ +bool QtIOCompressor::isSequential() const +{ + return true; +} + +/*! + Opens the QtIOCompressor in \a mode. Only ReadOnly and WriteOnly is supported. + This functon will return false if you try to open in other modes. + + If the underlying device is not opened, this function will open it in a suitable mode. If this happens + the device will also be closed when close() is called. + + If the underlying device is already opened, its openmode must be compatable with \a mode. + + Returns true on success, false on error. + + \sa close() +*/ +bool QtIOCompressor::open(OpenMode mode) +{ + Q_D(QtIOCompressor); + if (isOpen()) { + qWarning("QtIOCompressor::open: device already open"); + return false; + } + + // Check for correct mode: ReadOnly xor WriteOnly + const bool read = (mode & ReadOnly); + const bool write = (mode & WriteOnly); + const bool both = (read && write); + const bool neither = !(read || write); + if (both || neither) { + qWarning("QtIOCompressor::open: QtIOCompressor can only be opened in the ReadOnly or WriteOnly modes"); + return false; + } + + // If the underlying device is open, check that is it opened in a compatible mode. + if (d->device->isOpen()) { + d->manageDevice = false; + const OpenMode deviceMode = d->device->openMode(); + if (read && !(deviceMode & ReadOnly)) { + qWarning("QtIOCompressor::open: underlying device must be open in one of the ReadOnly or WriteOnly modes"); + return false; + } else if (write && !(deviceMode & WriteOnly)) { + qWarning("QtIOCompressor::open: underlying device must be open in one of the ReadOnly or WriteOnly modes"); + return false; + } + + // If the underlying device is closed, open it. + } else { + d->manageDevice = true; + if (d->device->open(mode) == false) { + setErrorString(QT_TRANSLATE_NOOP("QtIOCompressor", "Error opening underlying device: ") + d->device->errorString()); + return false; + } + } + + // Initialize zlib for deflating or inflating. + + // The second argument to inflate/deflateInit2 is the windowBits parameter, + // which also controls what kind of compression stream headers to use. + // The default value for this is 15. Passing a value greater than 15 + // enables gzip headers and then subtracts 16 form the windowBits value. + // (So passing 31 gives gzip headers and 15 windowBits). Passing a negative + // value selects no headers hand then negates the windowBits argument. + int windowBits; + switch (d->streamFormat) { + case QtIOCompressor::GzipFormat: + windowBits = 31; + break; + case QtIOCompressor::RawZipFormat: + windowBits = -15; + break; + default: + windowBits = 15; + } + + int status; + if (read) { + d->state = QtIOCompressorPrivate::NotReadFirstByte; + d->zlibStream.avail_in = 0; + d->zlibStream.next_in = 0; + if (d->streamFormat == QtIOCompressor::ZlibFormat) { + status = inflateInit(&d->zlibStream); + } else { + if (checkGzipSupport(zlibVersion()) == false) { + setErrorString(QT_TRANSLATE_NOOP("QtIOCompressor::open", "The gzip format not supported in this version of zlib.")); + return false; + } + + status = inflateInit2(&d->zlibStream, windowBits); + } + } else { + d->state = QtIOCompressorPrivate::NoBytesWritten; + if (d->streamFormat == QtIOCompressor::ZlibFormat) + status = deflateInit(&d->zlibStream, d->compressionLevel); + else + status = deflateInit2(&d->zlibStream, d->compressionLevel, Z_DEFLATED, windowBits, 8, Z_DEFAULT_STRATEGY); + } + + // Handle error. + if (status != Z_OK) { + d->setZlibError(QT_TRANSLATE_NOOP("QtIOCompressor::open", "Internal zlib error: "), status); + return false; + } + return QIODevice::open(mode); +} + +/*! + Closes the QtIOCompressor, and also the underlying device if it was opened by QtIOCompressor. + \sa open() +*/ +void QtIOCompressor::close() +{ + Q_D(QtIOCompressor); + if (isOpen() == false) + return; + + // Flush and close the zlib stream. + if (openMode() & ReadOnly) { + d->state = QtIOCompressorPrivate::NotReadFirstByte; + inflateEnd(&d->zlibStream); + } else { + if (d->state == QtIOCompressorPrivate::BytesWritten) { // Only flush if we have written anything. + d->state = QtIOCompressorPrivate::NoBytesWritten; + d->flushZlib(Z_FINISH); + } + deflateEnd(&d->zlibStream); + } + + // Close the underlying device if we are managing it. + if (d->manageDevice) + d->device->close(); + + QIODevice::close(); +} + +/*! + Flushes the internal buffer. + + Each time you call flush, all data written to the QtIOCompressor is compressed and written to the + underlying device. Calling this function can reduce the compression ratio. The underlying device + is not flushed. + + Calling this function when QtIOCompressor is in ReadOnly mode has no effect. +*/ +void QtIOCompressor::flush() +{ + Q_D(QtIOCompressor); + if (isOpen() == false || openMode() & ReadOnly) + return; + + d->flushZlib(Z_SYNC_FLUSH); +} + +/*! + Returns 1 if there might be data available for reading, or 0 if there is no data available. + + There is unfortunately no way of knowing how much data there is available when dealing with compressed streams. + + Also, since the remaining compressed data might be a part of the meta-data that ends the compressed stream (and + therefore will yield no uncompressed data), you cannot assume that a read after getting a 1 from this function will return data. +*/ +qint64 QtIOCompressor::bytesAvailable() const +{ + Q_D(const QtIOCompressor); + if ((openMode() & ReadOnly) == false) + return 0; + + int numBytes = 0; + + switch (d->state) { + case QtIOCompressorPrivate::NotReadFirstByte: + numBytes = d->device->bytesAvailable(); + break; + case QtIOCompressorPrivate::InStream: + numBytes = 1; + break; + case QtIOCompressorPrivate::EndOfStream: + case QtIOCompressorPrivate::Error: + default: + numBytes = 0; + break; + }; + + numBytes += QIODevice::bytesAvailable(); + + if (numBytes > 0) + return 1; + else + return 0; +} + +/*! + \internal + Reads and decompresses data from the underlying device. +*/ +qint64 QtIOCompressor::readData(char *data, qint64 maxSize) +{ + Q_D(QtIOCompressor); + + if (d->state == QtIOCompressorPrivate::EndOfStream) + return 0; + + if (d->state == QtIOCompressorPrivate::Error) + return -1; + + // We are ging to try to fill the data buffer + d->zlibStream.next_out = reinterpret_cast(data); + d->zlibStream.avail_out = maxSize; + + int status; + do { + // Read data if if the input buffer is empty. There could be data in the buffer + // from a previous readData call. + if (d->zlibStream.avail_in == 0) { + qint64 bytesAvalible = d->device->read(reinterpret_cast(d->buffer), d->bufferSize); + d->zlibStream.next_in = d->buffer; + d->zlibStream.avail_in = bytesAvalible; + + if (bytesAvalible == -1) { + d->state = QtIOCompressorPrivate::Error; + setErrorString(QT_TRANSLATE_NOOP("QtIOCompressor", "Error reading data from underlying device: ") + d->device->errorString()); + return -1; + } + + if (d->state != QtIOCompressorPrivate::InStream) { + // If we are not in a stream and get 0 bytes, we are probably trying to read from an empty device. + if(bytesAvalible == 0) + return 0; + else if (bytesAvalible > 0) + d->state = QtIOCompressorPrivate::InStream; + } + } + + // Decompress. + status = inflate(&d->zlibStream, Z_SYNC_FLUSH); + switch (status) { + case Z_NEED_DICT: + case Z_DATA_ERROR: + case Z_MEM_ERROR: + d->state = QtIOCompressorPrivate::Error; + d->setZlibError(QT_TRANSLATE_NOOP("QtIOCompressor", "Internal zlib error when decompressing: "), status); + return -1; + case Z_BUF_ERROR: // No more input and zlib can not privide more output - Not an error, we can try to read again when we have more input. + return 0; + break; + } + // Loop util data buffer is full or we reach the end of the input stream. + } while (d->zlibStream.avail_out != 0 && status != Z_STREAM_END); + + if (status == Z_STREAM_END) { + d->state = QtIOCompressorPrivate::EndOfStream; + + // Unget any data left in the read buffer. + for (int i = d->zlibStream.avail_in; i >= 0; --i) + d->device->ungetChar(*reinterpret_cast(d->zlibStream.next_in + i)); + } + + const ZlibSize outputSize = maxSize - d->zlibStream.avail_out; + return outputSize; +} + + +/*! + \internal + Compresses and writes data to the underlying device. +*/ +qint64 QtIOCompressor::writeData(const char *data, qint64 maxSize) +{ + if (maxSize < 1) + return 0; + Q_D(QtIOCompressor); + d->zlibStream.next_in = reinterpret_cast(const_cast(data)); + d->zlibStream.avail_in = maxSize; + + if (d->state == QtIOCompressorPrivate::Error) + return -1; + + do { + d->zlibStream.next_out = d->buffer; + d->zlibStream.avail_out = d->bufferSize; + const int status = deflate(&d->zlibStream, Z_NO_FLUSH); + if (status != Z_OK) { + d->state = QtIOCompressorPrivate::Error; + d->setZlibError(QT_TRANSLATE_NOOP("QtIOCompressor", "Internal zlib error when compressing: "), status); + return -1; + } + + ZlibSize outputSize = d->bufferSize - d->zlibStream.avail_out; + + // Try to write data from the buffer to to the underlying device, return -1 on failure. + if (d->writeBytes(d->buffer, outputSize) == false) + return -1; + + } while (d->zlibStream.avail_out == 0); // run until output is not full. + Q_ASSERT(d->zlibStream.avail_in == 0); + + return maxSize; +} + +/* + \internal + Checks if the run-time zlib version is 1.2.x or higher. +*/ +bool QtIOCompressor::checkGzipSupport(const char * const versionString) +{ + if (strlen(versionString) < 3) + return false; + + if (versionString[0] == '0' || (versionString[0] == '1' && (versionString[2] == '0' || versionString[2] == '1' ))) + return false; + + return true; +} diff --git a/src/streams/qtiocompressor.h b/src/streams/qtiocompressor.h new file mode 100644 index 000000000..72b21cbc3 --- /dev/null +++ b/src/streams/qtiocompressor.h @@ -0,0 +1,94 @@ +/**************************************************************************** +** +** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of a Qt Solutions component. +** +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Solutions Commercial License Agreement provided +** with the Software or, alternatively, in accordance with the terms +** contained in a written agreement between you and Nokia. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.1, included in the file LICENSE.NOKIA-LGPL-EXCEPTION +** in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL-3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** Please note Third Party Software included with Qt Solutions may impose +** additional restrictions and it is the user's responsibility to ensure +** that they have met the licensing requirements of the GPL, LGPL, or Qt +** Solutions Commercial license and the relevant license of the Third +** Party Software they are using. +** +** If you are unsure which license is appropriate for your use, please +** contact Nokia at qt-info@nokia.com. +** +****************************************************************************/ + +#ifndef QTIOCOMPRESSOR_H +#define QTIOCOMPRESSOR_H + +#include + +#if defined(Q_WS_WIN) +# if !defined(QT_QTIOCOMPRESSOR_EXPORT) && !defined(QT_QTIOCOMPRESSOR_IMPORT) +# define QT_QTIOCOMPRESSOR_EXPORT +# elif defined(QT_QTIOCOMPRESSOR_IMPORT) +# if defined(QT_QTIOCOMPRESSOR_EXPORT) +# undef QT_QTIOCOMPRESSOR_EXPORT +# endif +# define QT_QTIOCOMPRESSOR_EXPORT __declspec(dllimport) +# elif defined(QT_QTIOCOMPRESSOR_EXPORT) +# undef QT_QTIOCOMPRESSOR_EXPORT +# define QT_QTIOCOMPRESSOR_EXPORT __declspec(dllexport) +# endif +#else +# define QT_QTIOCOMPRESSOR_EXPORT +#endif + +class QtIOCompressorPrivate; +class QT_QTIOCOMPRESSOR_EXPORT QtIOCompressor : public QIODevice +{ +Q_OBJECT +public: +enum StreamFormat { ZlibFormat, GzipFormat, RawZipFormat }; + QtIOCompressor(QIODevice *device, int compressionLevel = 6, int bufferSize = 65500); + ~QtIOCompressor(); + void setStreamFormat(StreamFormat format); + StreamFormat streamFormat() const; + static bool isGzipSupported(); + bool isSequential() const; + bool open(OpenMode mode); + void close(); + void flush(); + qint64 bytesAvailable() const; +protected: + qint64 readData(char * data, qint64 maxSize); + qint64 writeData(const char * data, qint64 maxSize); +private: + static bool checkGzipSupport(const char * const versionString); + QtIOCompressorPrivate *d_ptr; + Q_DECLARE_PRIVATE(QtIOCompressor) + Q_DISABLE_COPY(QtIOCompressor) +}; + +#endif diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 41b1e6476..0a1ceb627 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -66,22 +66,22 @@ endmacro (ADD_UNIT_TEST) # TODO automocify? add_unit_test( testgroup TestGroup.cpp ) -target_link_libraries( testgroup keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} ) +target_link_libraries( testgroup keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} ${ZLIB_LIBRARIES} ) add_unit_test( testkeepass2xmlreader TestKeePass2XmlReader.cpp ) -target_link_libraries( testkeepass2xmlreader keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} ) +target_link_libraries( testkeepass2xmlreader keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} ${ZLIB_LIBRARIES} ) add_unit_test( testkeepass2reader TestKeePass2Reader.cpp ) -target_link_libraries( testkeepass2reader keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} ) +target_link_libraries( testkeepass2reader keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} ${ZLIB_LIBRARIES} ) add_unit_test( testgroupmodel TestGroupModel.cpp modeltest.cpp ) -target_link_libraries( testgroupmodel keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} ) +target_link_libraries( testgroupmodel keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} ${ZLIB_LIBRARIES} ) add_unit_test( testentrymodel TestEntryModel.cpp modeltest.cpp ) -target_link_libraries( testentrymodel keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} ) +target_link_libraries( testentrymodel keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} ${ZLIB_LIBRARIES} ) add_unit_test( testcryptohash TestCryptoHash.cpp ) -target_link_libraries( testcryptohash keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} ) +target_link_libraries( testcryptohash keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} ${ZLIB_LIBRARIES} ) add_unit_test( testsymmetriccipher TestSymmetricCipher.cpp ) target_link_libraries( testsymmetriccipher keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} ) diff --git a/tests/Compressed.kdbx b/tests/Compressed.kdbx new file mode 100644 index 0000000000000000000000000000000000000000..fd3108b934a6b1b8c2ebca783c146183fb287b0c GIT binary patch literal 1870 zcmV-U2eJ4A*`k_f`%AS100IC45CAd3^5(yBLr}h01tDtuTK@wC0096100bZamW=)h zDknvaloFLArCYktickK-AGdE<$m^`NAR>=|1t0*YE?SI!i!LHi2LA&A)#_S}4XKQ; z@7dp=E@nR&U)|IO2mo*w00000000LN064yroqQUP2w~v`Duodpf(Rf0t!B@&x+|RI_O2A`!{b-<`>PbIHf(|8NHx7| zUrI=cwBE}K1ONg60000401XNa3i8I@;)w_7-crAipi6hOI-i=u`evU#t7C{62lsej zs>$zmNfCcp48rYchTJ+L7q`3~q5Clptn)0v^SCgoD&w`yoz8-JnG;}GVZ6wkrGlmY zkcoCBujKt+X|nNXnV5l2{X24K|0bk7_zaLZPMCTS0zcw$F-HxKawE%kb(1`3SG9QRjAa8yI|4ZgEr1M zdh<3!OafqXLI=!x={woaA-C|Xj0pT6xA`2zoG)ocCfZS+iz^hgMLQEFg7kbZG~%zF zf%o)~_{1PBJ={DCfO~jfCf|NS1t46CI@rslQP5|eQnMvba!RYDU51^-&K<76A{W<` zTaBHAtrXls(S1tT!%#&&f=k1dyiqzzqkR1B)V{-@()ZR%`?SF2sU#MFla!1c*D4z~ z$76Qqb7mL*ZG+MBFkBnUMLYD^vboN35NfFCx(25mUc9Kta@_cAPb5$nXN1$XW)Xw* zi;)Rp*)I)fqzb0^=y=AXtLwY>n4CMKquWRu?*^rZt&eW{RvG*V%?VVW*!`5;lh><( zmA^9uqeP>YUFLqO2;x{3;#}P>s{9||WrM}M{`tl8?WAvonsYyl=uGe#5EYY-ki~D5`V(l;00g70bu=5xmxN+Q1#To_Hvl z*klsayao*$qL?JcJ$!$}R|GPrN{TedUT@EdEE$BA9QI2YDqeq-p+sxYu0eWBtJh&u zeeJcmUGy_Hf#}m>wkkp1?je|X?F7f|2#BTrKXb$;rxN|!*K%=hP2KG zQ$e;|rf?K#9m5{5%zv4qKzf?hCJ^`Dp`js)6RfADbuwSj#YBBnujZ8<_Rj{}e#kt^ zfA70!IYPA!0`oXH;1HfmTbNDgs{_-ky`>LzRPCn#g{Eypk9>N3<-oyNkhI!!$(+5_ zUC)-YY*3hj(bK2&dQ3EZG&9^i8^+sd&poLZU@v~*OF2Nz5LW`XbLW#!n$ZNRPml|y8&R9c(z zGa=x&gHc5?S(T3U{YPDx{(BZ(Vqs9hlF@}o6cz@Y15btT&H1D*-1m~g?O06@q}~r} zu6m%TCXMWWAI(Q{`!5W)2@3Ct25z%w1Dd+`8X&b&3XRpQN1QJVFQLRO-w>d$_4Sd! zi3TG8^In-|MjB`t4^TN40W?m{v6c{T*zJFpSULlG7m|Mc&SNVJ0#3^8VK=2q3oXV784%T3J^6;uj+7B%iHf_D)Zprd77T7`dkkJfu9HS#kaV3)5 zQ;~z}yAnv>N`-jgG(W2Y}VADRsK=yrYfL}+iq(KS#~CErom4lV4G#|T_0eqH+@J| z>AT6_>W@T{IR`?`w}Oib_rpo`rGEdJV&jS~@?<#ep>RhLlgQ^_X5}_YmF6jzsf{iL zd}Mh2`F9z$M63x?tkhF)wsD6T3}_tJOby0!iW=qpCmetadata()->name(), QString("NonAsciiTest")); } +void TestKeePass2Reader::testCompressed() +{ + QString filename = QString(KEEPASSX_TEST_DIR).append("/Compressed.kdbx"); + CompositeKey key; + key.addKey(PasswordKey("")); + KeePass2Reader* reader = new KeePass2Reader(); + Database* db = reader->readDatabase(filename, key); + QVERIFY(db); + QVERIFY(!reader->error()); + QCOMPARE(db->metadata()->name(), QString("Compressed")); +} + QTEST_MAIN(TestKeePass2Reader); #include "TestKeePass2Reader.moc"