Philipp Crocoll
|
2e8c76d0c4
|
Merge branch 'Keepass_Orig' + adapt to changes in KeePassLib. This introduced KDBX4 in Keepass2Android.
NOTE: seems like merging broke the capability to read KDBX<=3.
Conflicts:
src/KeePassLib2Android/Collections/AutoTypeConfig.cs
src/KeePassLib2Android/Collections/ProtectedBinaryDictionary.cs
src/KeePassLib2Android/Collections/ProtectedStringDictionary.cs
src/KeePassLib2Android/Collections/PwObjectList.cs
src/KeePassLib2Android/Collections/PwObjectPool.cs
src/KeePassLib2Android/Collections/StringDictionaryEx.cs
src/KeePassLib2Android/Cryptography/Cipher/CipherPool.cs
src/KeePassLib2Android/Cryptography/Cipher/ICipherEngine.cs
src/KeePassLib2Android/Cryptography/Cipher/Salsa20Cipher.cs
src/KeePassLib2Android/Cryptography/Cipher/StandardAesEngine.cs
src/KeePassLib2Android/Cryptography/CryptoRandom.cs
src/KeePassLib2Android/Cryptography/CryptoRandomStream.cs
src/KeePassLib2Android/Cryptography/HashingStreamEx.cs
src/KeePassLib2Android/Cryptography/HmacOtp.cs
src/KeePassLib2Android/Cryptography/PasswordGenerator/CharSetBasedGenerator.cs
src/KeePassLib2Android/Cryptography/PasswordGenerator/CustomPwGenerator.cs
src/KeePassLib2Android/Cryptography/PasswordGenerator/CustomPwGeneratorPool.cs
src/KeePassLib2Android/Cryptography/PasswordGenerator/PatternBasedGenerator.cs
src/KeePassLib2Android/Cryptography/PasswordGenerator/PwCharSet.cs
src/KeePassLib2Android/Cryptography/PasswordGenerator/PwGenerator.cs
src/KeePassLib2Android/Cryptography/PasswordGenerator/PwProfile.cs
src/KeePassLib2Android/Cryptography/PopularPasswords.cs
src/KeePassLib2Android/Cryptography/QualityEstimation.cs
src/KeePassLib2Android/Cryptography/SelfTest.cs
src/KeePassLib2Android/Delegates/Handlers.cs
src/KeePassLib2Android/Interfaces/IDeepCloneable.cs
src/KeePassLib2Android/Interfaces/IStatusLogger.cs
src/KeePassLib2Android/Interfaces/IStructureItem.cs
src/KeePassLib2Android/Interfaces/ITimeLogger.cs
src/KeePassLib2Android/Interfaces/IUIOperations.cs
src/KeePassLib2Android/Interfaces/IXmlSerializerEx.cs
src/KeePassLib2Android/Keys/CompositeKey.cs
src/KeePassLib2Android/Keys/IUserKey.cs
src/KeePassLib2Android/Keys/KcpCustomKey.cs
src/KeePassLib2Android/Keys/KcpKeyFile.cs
src/KeePassLib2Android/Keys/KcpPassword.cs
src/KeePassLib2Android/Keys/KcpUserAccount.cs
src/KeePassLib2Android/Keys/KeyProvider.cs
src/KeePassLib2Android/Keys/KeyProviderPool.cs
src/KeePassLib2Android/Keys/KeyValidator.cs
src/KeePassLib2Android/Keys/KeyValidatorPool.cs
src/KeePassLib2Android/Keys/UserKeyType.cs
src/KeePassLib2Android/Native/NativeLib.cs
src/KeePassLib2Android/Native/NativeMethods.cs
src/KeePassLib2Android/Properties/AssemblyInfo.cs
src/KeePassLib2Android/PwCustomIcon.cs
src/KeePassLib2Android/PwDatabase.cs
src/KeePassLib2Android/PwDefs.cs
src/KeePassLib2Android/PwDeletedObject.cs
src/KeePassLib2Android/PwEntry.cs
src/KeePassLib2Android/PwEnums.cs
src/KeePassLib2Android/PwGroup.cs
src/KeePassLib2Android/PwUuid.cs
src/KeePassLib2Android/Resources/KLRes.Generated.cs
src/KeePassLib2Android/Security/ProtectedBinary.cs
src/KeePassLib2Android/Security/ProtectedString.cs
src/KeePassLib2Android/Security/XorredBuffer.cs
src/KeePassLib2Android/Serialization/BinaryReaderEx.cs
src/KeePassLib2Android/Serialization/FileLock.cs
src/KeePassLib2Android/Serialization/FileTransactionEx.cs
src/KeePassLib2Android/Serialization/HashedBlockStream.cs
src/KeePassLib2Android/Serialization/IOConnection.cs
src/KeePassLib2Android/Serialization/IOConnectionInfo.cs
src/KeePassLib2Android/Serialization/KdbxFile.Read.Streamed.cs
src/KeePassLib2Android/Serialization/KdbxFile.Read.cs
src/KeePassLib2Android/Serialization/KdbxFile.Write.cs
src/KeePassLib2Android/Serialization/KdbxFile.cs
src/KeePassLib2Android/Serialization/OldFormatException.cs
src/KeePassLib2Android/Translation/KPControlCustomization.cs
src/KeePassLib2Android/Translation/KPFormCustomization.cs
src/KeePassLib2Android/Translation/KPStringTable.cs
src/KeePassLib2Android/Translation/KPStringTableItem.cs
src/KeePassLib2Android/Translation/KPTranslation.cs
src/KeePassLib2Android/Translation/KPTranslationProperties.cs
src/KeePassLib2Android/Utility/AppLogEx.cs
src/KeePassLib2Android/Utility/GfxUtil.cs
src/KeePassLib2Android/Utility/MemUtil.cs
src/KeePassLib2Android/Utility/MessageService.cs
src/KeePassLib2Android/Utility/StrUtil.cs
src/KeePassLib2Android/Utility/TimeUtil.cs
src/KeePassLib2Android/Utility/UrlUtil.cs
|
2016-08-31 06:55:53 +02:00 |
|
Philipp Crocoll
|
6d1e28e502
|
Keepass original source code version 2.34
|
2016-08-30 04:09:53 +02:00 |
|
Philipp Crocoll
|
1b84707970
|
Merge branch 'kplibdesktop' into integrate_kplib_2_24_update
Conflicts:
src/KeePassLib2Android/Cryptography/CryptoRandom.cs
src/KeePassLib2Android/Keys/KcpKeyFile.cs
src/KeePassLib2Android/Keys/KcpUserAccount.cs
src/KeePassLib2Android/Native/NativeLib.cs
src/KeePassLib2Android/PwCustomIcon.cs
src/KeePassLib2Android/PwDatabase.cs
src/KeePassLib2Android/PwEntry.cs
src/KeePassLib2Android/PwGroup.cs
src/KeePassLib2Android/PwUuid.cs
src/KeePassLib2Android/Security/ProtectedBinary.cs
src/KeePassLib2Android/Serialization/FileLock.cs
src/KeePassLib2Android/Serialization/FileTransactionEx.cs
src/KeePassLib2Android/Serialization/HashedBlockStream.cs
src/KeePassLib2Android/Serialization/IOConnection.cs
src/KeePassLib2Android/Serialization/KdbxFile.Read.Streamed.cs
src/KeePassLib2Android/Serialization/KdbxFile.Read.cs
src/KeePassLib2Android/Serialization/KdbxFile.Write.cs
src/KeePassLib2Android/Translation/KPControlCustomization.cs
src/KeePassLib2Android/Translation/KPFormCustomization.cs
src/KeePassLib2Android/Translation/KPStringTable.cs
src/KeePassLib2Android/Translation/KPTranslation.cs
src/KeePassLib2Android/Utility/GfxUtil.cs
src/KeePassLib2Android/Utility/MessageService.cs
src/KeePassLib2Android/Utility/StrUtil.cs
|
2013-11-13 04:13:27 +01:00 |
|
Philipp Crocoll
|
aa81003823
|
update to 2.24
|
2013-11-13 03:29:48 +01:00 |
|
PhilippC
|
19f7dcf26d
|
initial release 0.5.0 BETA
|
2013-02-23 17:45:00 +01:00 |
|
PhilippC
|
36c1df19d4
|
Unmodified KeepassLib from KeePass Desktop v2.20
|
2013-02-23 14:24:43 +01:00 |
|