d0879bfe39
complete merging of Keepass 2.35, fix auto-merge errors
2017-01-12 05:56:20 +01:00
34e572dad1
Merge branch 'Keepass_Orig'
...
Conflicts:
src/KeePassLib2Android/Cryptography/CryptoRandom.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/IUserKey.cs
src/KeePassLib2Android/Keys/KcpCustomKey.cs
src/KeePassLib2Android/Keys/KcpUserAccount.cs
src/KeePassLib2Android/PwCustomIcon.cs
src/KeePassLib2Android/PwGroup.cs
src/KeePassLib2Android/Serialization/FileTransactionEx.cs
src/KeePassLib2Android/Serialization/HashedBlockStream.cs
src/KeePassLib2Android/Serialization/IOConnection.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/Utility/GfxUtil.cs
src/KeePassLib2Android/Utility/MessageService.cs
src/KeePassLib2Android/Utility/MonoWorkarounds.cs
src/KeePassLib2Android/Utility/TimeUtil.cs
2017-01-11 18:02:44 +01:00
26c0fde41c
Keepass lib 2.35
2017-01-11 07:57:01 +01:00
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
a2f2e3d6f8
Keepass Orig KeePass_160826
2016-08-30 04:11:48 +02:00
6d1e28e502
Keepass original source code version 2.34
2016-08-30 04:09:53 +02:00
82b288ae71
switch back to Mono implementation for GZip
2016-01-11 21:57:54 +01:00
fad8dc8b22
fixed bugs:
...
- work around Mono bug in GZipStream (see http://sourceforge.net/p/keepass/bugs/1373/ ) by including a custom GZipStream implementation
- fixed issue with export database to System file picker location
- fixed issues with preference options crashing with ActivityNotFound (due to changes in Xamarin 5.1, see https://bugzilla.xamarin.com/show_bug.cgi?id=33617
updated manifest/changelog
2015-09-03 22:03:28 +02:00
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
aa81003823
update to 2.24
2013-11-13 03:29:48 +01:00
bf84662857
Fixed reference equality checks for PwUuid
2013-07-13 08:14:32 +01:00
16c08cbe8a
Merge branch 'ProtocolBuffers' of https://git01.codeplex.com/forks/alexvallat/keepass2androidperfopt into AlexVallat/ProtocolBuffers
...
Conflicts:
src/KeePassLib2Android/PwDatabase.cs
src/KeePassLib2Android/Serialization/KdbxFile.Read.cs
2013-07-09 11:03:31 +02:00
b58d58771b
Kdbp format selection by filename. If the filename ends in .kdbp, it is assumed to be kdbp format. Otherwise, kdbx format is used. A file is always saved in the same format it is opened in.
2013-06-30 09:47:40 +01:00
41e9c80456
Strictly for experimentation. When saving a databse, it will be saved in protocol buffer format. Opening will work for either xml or protocol buffers.
2013-06-21 18:28:49 +01:00
19f7dcf26d
initial release 0.5.0 BETA
2013-02-23 17:45:00 +01:00
36c1df19d4
Unmodified KeepassLib from KeePass Desktop v2.20
2013-02-23 14:24:43 +01:00
Philipp Crocoll