diff -Nru keepass2-2.16+dfsg/Build/KeePassLib_Distrib/KeePassLib.xml keepass2-2.18+dfsg/Build/KeePassLib_Distrib/KeePassLib.xml
--- keepass2-2.16+dfsg/Build/KeePassLib_Distrib/KeePassLib.xml 2011-07-12 08:01:04.000000000 +0000
+++ keepass2-2.18+dfsg/Build/KeePassLib_Distrib/KeePassLib.xml 2012-01-05 09:30:12.000000000 +0000
@@ -134,11 +134,6 @@
Interface to a user key, like a password, key file data, etc.
-
-
- Clear the key and securely erase all security-critical information.
-
-
Get key data. Querying this property is fast (it returns a
@@ -202,11 +197,6 @@
Construct a user account key.
-
-
- Clear the key and securely erase all security-critical information.
-
-
Get key data. Querying this property is fast (it returns a
@@ -296,6 +286,13 @@
property should return false.
+
+
+ This property specifies whether the key provider is compatible
+ with the secure desktop mode. This almost never is the case,
+ so you usually won't override this property.
+
+
Class containing self-test methods.
@@ -353,17 +350,6 @@
Construct a new, empty key object.
-
-
- Deconstructor, clears up the key.
-
-
-
-
- Clears the key. This function also erases all previously stored
- user key data objects.
-
-
Add a user key.
@@ -450,24 +436,15 @@
Represents an in-memory encrypted string.
+ ProtectedString objects are immutable and thread-safe.
Construct a new protected string object. Protection is
- disabled by default! You need to call the
- EnableProtection member function in order to
- enable the protection, if you wish the string to be protected.
+ disabled.
-
-
- Construct a new in-memory encrypted string object.
-
- If this parameter is true,
- the string will be protected in-memory (encrypted). If it
- is false, the string will be stored as plain-text.
-
Construct a new protected string. The string is initialized
@@ -488,17 +465,8 @@
the string will be protected in-memory (encrypted). If it
is false, the string will be stored as plain-text.
The initial string value, encoded as
- UTF-8 byte array. This parameter won't be modified.
-
-
-
- Construct a new protected string. The string is initialized
- to the value passed in the pbTemplate protected string.
-
- The initial string value. This
- parameter won't be modified. Must not be null.
- Thrown if the input
- parameter is null.
+ UTF-8 byte array. This parameter won't be modified; the caller
+ is responsible for clearing it.
@@ -512,38 +480,11 @@
Thrown if the input
parameter is null.
-
-
- Clear the string. Doesn't change the protection level.
-
-
-
-
- Change the protection level (protect or don't protect). Note: you
- only need to call this function if you really want to change the
- protection. If you specified the protection flag in the constructor,
- and don't want to change it, you don't need to call this function.
-
- If true, the string will be protected
- (encrypted in-memory). Otherwise the string will be stored in
- plain-text in the process memory.
-
-
-
- Assign a new string value to the object.
-
- New string. The string must not contain
- a null terminator.
- Thrown if the input
- parameter is null.
- Thrown if the new string
- contains a null terminator.
-
Convert the protected string to a normal string object.
Be careful with this function, the returned string object
- isn't protected any more and stored in plain-text in the
+ isn't protected anymore and stored in plain-text in the
process memory.
Plain-text string. Is never null.
@@ -559,12 +500,7 @@
Read the protected string and return it protected with a sequence
- of bytes generated by a random stream. The object's data will be
- invisible in process memory only if the object has been initialized
- using a XorredBuffer. If no XorredBuffer has been used
- or the string has been read once already (in plain-text), the
- operation won't be secure and the protected string will be visible
- in process memory.
+ of bytes generated by a random stream.
Random number source.
Protected string.
@@ -573,62 +509,34 @@
- A flag specifying whether the ProtectedString object has turned on
- in-memory protection or not.
-
-
-
-
- A value specifying whether the ProtectedString object is currently
- in-memory protected or not. This flag can be different than
- IsProtected: if a XorredBuffer is used, the IsProtected
- flag represents the memory protection flag, but not the actual protection.
- In this case use IsViewable, which returns true if a
- XorredBuffer is currently in use.
+ A flag specifying whether the ProtectedString object
+ has turned on in-memory protection or not.
Represents a protected binary, i.e. a byte array that is encrypted
- in-memory.
+ in memory. A ProtectedBinary object is immutable and
+ thread-safe.
Construct a new, empty protected binary data object. Protection
- is disabled by default! You need to call the
- EnableProtection member function to enable the protection
- manually, if you wish the data to be protected.
-
-
-
-
- Construct a new, empty protected binary data object.
+ is disabled.
- If this parameter is true,
- the data will be encrypted in-memory. If it is false, the
- data is stored in plain-text in the process memory.
Construct a new protected binary data object.
If this paremeter is true,
- the data will be encrypted in-memory. If it is false, the
+ the data will be encrypted in memory. If it is false, the
data is stored in plain-text in the process memory.
- Initial value of the protected
- object. The input parameter is not modified.
-
-
-
- Construct a new protected binary data object. Copy the data from
- an existing object.
-
- Existing ProtectedBinary object,
- which is used to initialize the new object. This parameter must
- not be null.
- Thrown if the input
- parameter is null.
+ Value of the protected object.
+ The input parameter is not modified and
+ ProtectedBinary doesn't take ownership of the data,
+ i.e. the caller is responsible for clearing it.
@@ -641,40 +549,12 @@
Thrown if the input
parameter is null.
-
-
- Clear the protected data object. Doesn't change the protection level.
-
-
-
-
- Change the protection level (protect or don't protect). Note: you
- only need to call this function if you really want to change the
- protection. If you specified the protection flag in the constructor,
- and don't want to change it, you don't need to call this function.
-
- If true, the data will be protected
- (encrypted in-memory). Otherwise the data will be stored in
- plain-text in the process memory.
-
-
-
- Set protected data. This function also clears the internal
- XorredBuffer object.
-
- Data to store in the protected object. The input
- byte array will not be modified, the data is copied to an internal
- buffer of the protected object. This parameter must not be null;
- if you want to clear the object, call the Clear member
- function.
- Thrown if the input
- parameter is null.
-
- Get the protected data as a byte array. Please note that the returned
- byte array is not protected and can therefore been read by any other
- applications. Make sure that your clear it properly after usage.
+ Get a copy of the protected data as a byte array.
+ Please note that the returned byte array is not protected and
+ can therefore been read by any other application.
+ Make sure that your clear it properly after usage.
Unprotected byte array. This is always a copy of the internal
protected data and can therefore be cleared safely.
@@ -682,12 +562,7 @@
Read the protected data and return it protected with a sequence
- of bytes generated by a random stream. The object's data will be
- invisible in process memory only if the object has been initialized
- using a XorredBuffer. If no XorredBuffer has been used
- or the binary has been read once already (in plain-text), the
- operation won't be secure and the protected string will be visible
- in process memory.
+ of bytes generated by a random stream.
Random number source.
Protected data.
@@ -696,18 +571,8 @@
- A flag specifying whether the ProtectedBinary object has turned on
- in-memory protection or not.
-
-
-
-
- A value specifying whether the ProtectedString object is currently
- in-memory protected or not. This flag can be different than
- IsProtected: if a XorredBuffer is used, the IsProtected
- flag represents the memory protection flag, but not the actual protection.
- In this case use IsViewable, which returns true if a
- XorredBuffer is currently in use.
+ A flag specifying whether the ProtectedBinary object has
+ turned on in-memory protection or not.
@@ -816,6 +681,12 @@
'Failed to load the specified file!'.
+
+
+ Look up a localized string similar to
+ 'The file is locked, because the following user is currently writing to it:'.
+
+
Look up a localized string similar to
@@ -906,6 +777,12 @@
'The selected file appears to be an old format'.
+
+
+ Look up a localized string similar to
+ 'Please try it again in a few seconds.'.
+
+
Look up a localized string similar to
@@ -1035,11 +912,11 @@
Convert a hexadecimal string to a byte array. The input string must be
even (i.e. its length is a multiple of 2).
- String containing hexadecimal characters.
+ String containing hexadecimal characters.
Returns a byte array. Returns null if the string parameter
was null or is an uneven string (i.e. if its length isn't a
multiple of 2).
- Thrown if
+ Thrown if
is null.
@@ -1276,11 +1153,19 @@
Returns true, if the operation completed successfully,
otherwise false.
-
+
- Search this group and all groups in the current one for entries.
+ Search this group and all subgroups for entries.
- Specifies the search method.
+ Specifies the search method.
+ Entry list in which the search results will
+ be stored.
+
+
+
+ Search this group and all subgroups for entries.
+
+ Specifies the search method.
Entry list in which the search results will
be stored.
@@ -1520,8 +1405,8 @@
Represents an object that is encrypted using a XOR pad until
- it is read. The key XOR pad can be changed without revealing the
- protected data in process memory.
+ it is read. XorredBuffer objects are immutable and
+ thread-safe.
@@ -1530,10 +1415,12 @@
and a XOR pad that decrypts the protected data. The
byte array must have the same size
as the byte array.
+ The XorredBuffer object takes ownership of the two byte
+ arrays, i.e. the caller must not use or modify them afterwards.
Protected data (XOR pad applied).
- XOR pad that is used to decrypt the
- parameter.
+ XOR pad that can be used to decrypt the
+ parameter.
Thrown if one of the input
parameters is null.
Thrown if the byte arrays are
@@ -1541,40 +1428,11 @@
- Decrypt the buffer. The XorredBuffer protection is useless
- after you used this method. The object cannot be re-encrypted.
+ Get a copy of the plain-text. The caller is responsible
+ for clearing the byte array safely after using it.
Unprotected plain-text byte array.
-
-
- Change the protection key for this XorredBuffer object.
- The data will first be decrypted using the old key and then
- re-encrypted using the new key. This operation doesn't reveal
- the plain-text in the process memory.
-
- New protection pad. Must contain exactly
- the same number of bytes as the length of the currently protected data.
- Use the Length property of the XorredBuffer to query
- the data length and pass a correct number of bytes to ChangeKey.
- New protected data (encrypted using the new XOR pad).
- Thrown if the input
- parameter is null.
- Thrown if the input
- byte array doesn't have the correct size.
-
-
-
- XOR all bytes in a data buffer with a pad. Both byte arrays must
- be of the same size.
-
- Data to be protected.
- XOR pad.
- Thrown if one of the
- parameters is null.
- Thrown if the length of
- the data array and the pad aren't equal.
-
Length of the protected data in bytes.
@@ -1731,6 +1589,35 @@
Virtual identifier -- represents the number of icons.
+
+
+ Comparison modes for in-memory protected objects.
+
+
+
+
+ Ignore the in-memory protection states.
+
+
+
+
+ Ignore the in-memory protection states of standard
+ objects; do compare in-memory protection states of
+ custom objects.
+
+
+
+
+ Compare in-memory protection states.
+
+
+
+
+ Empty standard string fields are considered to be the
+ same as non-existing standard string fields.
+ This doesn't affect custom string comparisons.
+
+
A class representing a password entry. A password entry consists of several
@@ -1953,11 +1840,6 @@
Master password / passphrase as provided by the user.
-
-
- Clear the key and securely erase all security-critical information.
-
-
Get the password as protected string.
@@ -2240,11 +2122,6 @@
Key files as provided by the user.
-
-
- Clear the key and securely erase all security-critical information.
-
-
Create a new, random key-file.
@@ -2335,6 +2212,18 @@
default system directory separator character is used.
Path having a directory separator as last character.
+
+
+ Get the host component of an URL.
+ This method is faster and more fault-tolerant than creating
+ an Uri
object and querying its Host
+ property.
+
+
+ For the input s://u:p@d.tld:p/p?q#f
the return
+ value is d.tld
.
+
+
Generate HMAC-based one-time passwords as specified in RFC 4226.
@@ -2354,7 +2243,7 @@
Encrypt a stream.
- Stream to read the plain text from.
+ Stream to read the plain-text from.
Key to use.
Initialization vector.
Stream, from which the encrypted data can be read.
@@ -2445,6 +2334,19 @@
Source text.
Text containing only valid XML characters.
+
+
+ Normalize new line characters in a string. Input strings may
+ contain mixed new line character sequences from all commonly
+ used operating systems (i.e. \r\n from Windows, \n from Unix
+ and \r from Mac OS.
+
+ String with mixed new line characters.
+ If true, new line characters
+ are normalized for Windows (\r\n); if false, new line
+ characters are normalized for Unix (\n).
+ String with normalized new line characters.
+
Split a string and include the separators in the splitted array.
@@ -2455,6 +2357,28 @@
matched case-sensitively or not.
Splitted string including separators.
+
+
+ Create a data URI (according to RFC 2397).
+
+ Data to encode.
+ Optional MIME type. If null,
+ an appropriate type is used.
+ Data URI.
+
+
+
+ Convert a data URI (according to RFC 2397) to binary data.
+
+ Data URI to decode.
+ Decoded binary data.
+
+
+
+ Remove placeholders from a string (wrapped in '{' and '}').
+ This doesn't remove environment variables (wrapped in '%').
+
+
The Kdb4File class supports saving the data to various
@@ -2849,8 +2773,8 @@
- URL to an XML file that contains information about the latest KeePass
- available on the website.
+ URL to a TXT file (eventually compressed) that contains information
+ about the latest KeePass version available on the website.
@@ -2963,6 +2887,11 @@
text matches a group/entry string.
+
+
+ Only for serialization.
+
+
Memory protection configuration structure (for default fields).
@@ -3036,6 +2965,11 @@
DateTime object to convert to a string.
String representing the specified DateTime object.
+
+
+ Parse a US textual date string, like e.g. "January 02, 2012".
+
+
Do not remember user name or password.
@@ -3053,66 +2987,25 @@
- A dictionary of auto-type window/keystroke sequence pairs.
+ A list of auto-type associations.
- Construct a new auto-type dictionary.
+ Construct a new auto-type associations list.
- Remove all window/keystroke sequence associations.
+ Remove all associations.
- Clone the auto-type dictionary.
+ Clone the auto-type associations list.
New, cloned object.
-
-
- Set a window/keystroke sequence pair.
-
- Name of the window. Must not be null.
- Keystroke sequence for the specified
- window. Must not be null.
- Thrown if one of the input
- parameters is null.
-
-
-
- Get a keystroke sequence associated with the specified window.
- Returns null, if no sequence can be found.
-
- Window identifier.
- Keystroke sequence associated with the specified window.
- The return value is null, if no keystroke sequence has been
- defined for this window yet.
- Thrown if the input
- parameter is null.
-
-
-
- Get a keystroke sequence associated with the specified window.
- Returns an empty string (""), if no sequence can be found.
-
- Window identifier.
- Keystroke sequence associated with the specified window.
- The return value is an empty string (""), if no keystroke
- sequence has been defined for this window yet.
- Thrown if the input
- parameter is null.
-
-
-
- Remove an auto-type entry.
-
- Window identifier. Must not be null.
- Returns true if the entry has been removed.
-
Specify whether auto-type is enabled or not.
@@ -3126,11 +3019,11 @@
The default keystroke sequence that is auto-typed if
- no matching window is found in the Items
+ no matching window is found in the Associations
container.
-
+
Get all auto-type window/keystroke sequence pairs.
diff -Nru keepass2-2.16+dfsg/debian/changelog keepass2-2.18+dfsg/debian/changelog
--- keepass2-2.16+dfsg/debian/changelog 2011-10-08 18:46:57.000000000 +0000
+++ keepass2-2.18+dfsg/debian/changelog 2012-01-06 07:14:04.000000000 +0000
@@ -1,3 +1,17 @@
+keepass2 (2.18+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ - refresh patches
+ - drop upstream applied patches:
+ explicitly-PUT-for-webdav-writes.patch
+ prefer-4.0-framework-if-available.patch
+ * add patch to improve autotype when dealing with multiple keyboard layouts
+ - Thanks to amiryal for the patch
+ * disable initial autoupdate popup via patch
+ * update years in debian/copyright
+
+ -- Julian Taylor Fri, 30 Dec 2011 15:45:59 +0100
+
keepass2 (2.16+dfsg-2) unstable; urgency=medium
* debian/copyright: fix dep-5 syntax errors and wrong license tags
diff -Nru keepass2-2.16+dfsg/debian/copyright keepass2-2.18+dfsg/debian/copyright
--- keepass2-2.16+dfsg/debian/copyright 2011-10-08 18:46:57.000000000 +0000
+++ keepass2-2.18+dfsg/debian/copyright 2012-01-06 07:14:04.000000000 +0000
@@ -4,18 +4,18 @@
Source: http://keepass.info/ repackaged to remove icon files obtained from other password managers with non dfsg free licenses, listing in debian/README.source
Files: *
-Copyright: 2003-2011 Dominik Reichl
+Copyright: 2003-2012 Dominik Reichl
License: GPL-2+
Files: KeePassLibSD/*
Copyright: 1999, 2000, 2001, Free Software Foundation, Inc
2001, Mike Krueger
2004, 2005 2006, John Reilly
- 2003-2011, Dominik Reichl
+ 2003-2012, Dominik Reichl
License: GPL-2+
Files: debian/*
-Copyright: 2011, Julian Taylor
+Copyright: 2011, 2012, Julian Taylor
License: GPL-2+
Files: KeePass/Resources/Nuvola/* KeePass/Resources/Nuvola_Client/* KeePass/Resources/Nuvola_IL/* Translation/TrlUtil/Resources/*
diff -Nru keepass2-2.16+dfsg/debian/patches/disable-autoupdate-dialog.patch keepass2-2.18+dfsg/debian/patches/disable-autoupdate-dialog.patch
--- keepass2-2.16+dfsg/debian/patches/disable-autoupdate-dialog.patch 1970-01-01 00:00:00.000000000 +0000
+++ keepass2-2.18+dfsg/debian/patches/disable-autoupdate-dialog.patch 2012-01-06 07:14:04.000000000 +0000
@@ -0,0 +1,26 @@
+From: Julian Taylor
+Date: Fri, 30 Dec 2011 16:32:12 +0100
+Subject: disable autoupdate dialog
+
+does makes not much sense for the package
+Forwarded: not-needed
+---
+ KeePass/App/Configuration/AceApplication.cs | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/KeePass/App/Configuration/AceApplication.cs b/KeePass/App/Configuration/AceApplication.cs
+index 922c750..e61c025 100644
+--- a/KeePass/App/Configuration/AceApplication.cs
++++ b/KeePass/App/Configuration/AceApplication.cs
+@@ -193,8 +193,8 @@ namespace KeePass.App.Configuration
+ set { m_bCheckForUpdate = value; }
+ }
+
+- private bool m_bCheckForUpdateCfg = false;
+- [DefaultValue(false)]
++ private bool m_bCheckForUpdateCfg = true;
++ [DefaultValue(true)]
+ public bool CheckForUpdateConfigured
+ {
+ get { return m_bCheckForUpdateCfg; }
+--
diff -Nru keepass2-2.16+dfsg/debian/patches/do-not-use-the-non-free-icons.patch keepass2-2.18+dfsg/debian/patches/do-not-use-the-non-free-icons.patch
--- keepass2-2.16+dfsg/debian/patches/do-not-use-the-non-free-icons.patch 2011-10-08 18:46:57.000000000 +0000
+++ keepass2-2.18+dfsg/debian/patches/do-not-use-the-non-free-icons.patch 2012-01-06 07:14:04.000000000 +0000
@@ -8,7 +8,7 @@
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/KeePass/Properties/Resources.resx b/KeePass/Properties/Resources.resx
-index e13ee0f..cd9967b 100644
+index 165f24f..ec8b31b 100644
--- a/KeePass/Properties/Resources.resx
+++ b/KeePass/Properties/Resources.resx
@@ -416,43 +416,43 @@
@@ -142,7 +142,7 @@
..\Resources\Images\B16x16_MenuRadio.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-@@ -563,12 +563,12 @@
+@@ -563,13 +563,13 @@
..\Resources\Nuvola\B16x16_KaboodleLoop.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -157,6 +157,6 @@
- ..\Resources\Images\B16x16_Imp_KasperskyPwMgr.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\Nuvola\B16x16_KGPG_Import.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-\ No newline at end of file
+
+ ..\Resources\Nuvola_Derived\B16x16_EditCopyLink.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
--
diff -Nru keepass2-2.16+dfsg/debian/patches/enable-local-help.patch keepass2-2.18+dfsg/debian/patches/enable-local-help.patch
--- keepass2-2.16+dfsg/debian/patches/enable-local-help.patch 2011-10-08 18:46:57.000000000 +0000
+++ keepass2-2.18+dfsg/debian/patches/enable-local-help.patch 2012-01-06 07:14:04.000000000 +0000
@@ -6,14 +6,14 @@
located as html files in "/usr/share/doc/keepass2/Chm/help/"
Forwarded: not-needed
---
- KeePass/App/AppHelp.cs | 12 +++++++-----
- 1 files changed, 7 insertions(+), 5 deletions(-)
+ KeePass/App/AppHelp.cs | 19 ++++++++-----------
+ 1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/KeePass/App/AppHelp.cs b/KeePass/App/AppHelp.cs
-index 3172a33..67d6419 100644
+index e6c2d61..0400844 100644
--- a/KeePass/App/AppHelp.cs
+++ b/KeePass/App/AppHelp.cs
-@@ -56,7 +56,7 @@ namespace KeePass.App
+@@ -58,7 +58,7 @@ namespace KeePass.App
{
if(m_strLocalHelpFile == null) return false;
@@ -22,11 +22,16 @@
catch(Exception) { }
return false;
}
-@@ -113,10 +113,12 @@ namespace KeePass.App
+@@ -114,14 +114,13 @@ namespace KeePass.App
+ private static void ShowHelpLocal(string strTopic, string strSection)
{
Debug.Assert(m_strLocalHelpFile != null);
-
-- string strCmd = @"ms-its:" + m_strLocalHelpFile;
+-
+- // Unblock CHM file for proper display of help contents
+- WinUtil.RemoveZoneIdentifier(m_strLocalHelpFile);
+-
+- string strCmd = "\"ms-its:" + m_strLocalHelpFile;
++
+ string strCmd = @"/usr/share/doc/keepass2/Chm/help/";
if(strTopic != null)
@@ -37,11 +42,13 @@
if(strSection != null)
{
-@@ -124,10 +126,10 @@ namespace KeePass.App
+@@ -129,12 +128,10 @@ namespace KeePass.App
strCmd += @"#" + strSection;
}
-- try { Process.Start("hh.exe", strCmd); }
+- strCmd += "\"";
+-
+- try { Process.Start(WinUtil.LocateSystemApp("hh.exe"), strCmd); }
+ try { Process.Start("x-www-browser", strCmd); }
catch(Exception exStart)
{
diff -Nru keepass2-2.16+dfsg/debian/patches/explicitly-PUT-for-webdav-writes.patch keepass2-2.18+dfsg/debian/patches/explicitly-PUT-for-webdav-writes.patch
--- keepass2-2.16+dfsg/debian/patches/explicitly-PUT-for-webdav-writes.patch 2011-10-08 18:46:57.000000000 +0000
+++ keepass2-2.18+dfsg/debian/patches/explicitly-PUT-for-webdav-writes.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-From: Julian Taylor
-Date: Thu, 6 Oct 2011 21:59:57 +0200
-Subject: explicitly PUT for webdav writes
-
-mono does not set HttpRequets.Method to POST for writes so the changing
-to from POST to PUT is not done ConfigureWebRequest leading to failed
-saving and deletion of the database on the webdav storage when
-transactions are enabled
-Applied-Upstream: 2.17
-Bug: https://bugzilla.novell.com/show_bug.cgi?id=722581
----
- KeePassLib/Serialization/IOConnection.cs | 11 ++++++++++-
- 1 files changed, 10 insertions(+), 1 deletions(-)
-
-diff --git a/KeePassLib/Serialization/IOConnection.cs b/KeePassLib/Serialization/IOConnection.cs
-index 5a93b76..a9b9cc9 100644
---- a/KeePassLib/Serialization/IOConnection.cs
-+++ b/KeePassLib/Serialization/IOConnection.cs
-@@ -243,7 +243,16 @@ namespace KeePassLib.Serialization
-
- if(ioc.IsLocalFile()) return OpenWriteLocal(ioc);
-
-- return CreateWebClient(ioc).OpenWrite(new Uri(ioc.Path));
-+ Uri uri = new Uri(ioc.Path);
-+
-+ // Mono does not set HttpWebRequest.Method to POST for writes,
-+ // so one needs to set the method to PUT explicitly
-+ if(NativeLib.IsUnix() && (uri.Scheme.Equals(Uri.UriSchemeHttp,
-+ StrUtil.CaseIgnoreCmp) || uri.Scheme.Equals(Uri.UriSchemeHttps,
-+ StrUtil.CaseIgnoreCmp)))
-+ return CreateWebClient(ioc).OpenWrite(uri, WebRequestMethods.Http.Put);
-+
-+ return CreateWebClient(ioc).OpenWrite(uri);
- }
- #else
- public static Stream OpenWrite(IOConnectionInfo ioc)
---
diff -Nru keepass2-2.16+dfsg/debian/patches/fix-XSL-search-path.patch keepass2-2.18+dfsg/debian/patches/fix-XSL-search-path.patch
--- keepass2-2.16+dfsg/debian/patches/fix-XSL-search-path.patch 2011-10-08 18:46:57.000000000 +0000
+++ keepass2-2.18+dfsg/debian/patches/fix-XSL-search-path.patch 2012-01-06 07:14:04.000000000 +0000
@@ -11,7 +11,7 @@
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/KeePass/App/AppDefs.cs b/KeePass/App/AppDefs.cs
-index af4fae3..9f66f18 100644
+index 8d3a12b..6de99da 100644
--- a/KeePass/App/AppDefs.cs
+++ b/KeePass/App/AppDefs.cs
@@ -36,6 +36,8 @@ namespace KeePass.App
@@ -24,7 +24,7 @@
public const string XslFileHtmlLite = "KDB4_DetailsLite.xsl";
public const string XslFileHtmlFull = "KDB4_DetailsFull.xsl";
diff --git a/KeePass/Forms/AboutForm.cs b/KeePass/Forms/AboutForm.cs
-index 56d8d76..2aa25ee 100644
+index 63a72e2..2e7ff32 100644
--- a/KeePass/Forms/AboutForm.cs
+++ b/KeePass/Forms/AboutForm.cs
@@ -92,8 +92,7 @@ namespace KeePass.Forms
diff -Nru keepass2-2.16+dfsg/debian/patches/prefer-4.0-framework-if-available.patch keepass2-2.18+dfsg/debian/patches/prefer-4.0-framework-if-available.patch
--- keepass2-2.16+dfsg/debian/patches/prefer-4.0-framework-if-available.patch 2011-10-08 18:46:57.000000000 +0000
+++ keepass2-2.18+dfsg/debian/patches/prefer-4.0-framework-if-available.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-From: Julian Taylor
-Date: Mon, 20 Jun 2011 15:20:47 +0200
-Subject: prefer 4.0 framework if available
-
-when compiled for 4.0 it will not run with 2.0
-Forwarded: not-needed
----
- Ext/KeePass.exe.config | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Ext/KeePass.exe.config b/Ext/KeePass.exe.config
-index ecfec22..59ed454 100644
---- a/Ext/KeePass.exe.config
-+++ b/Ext/KeePass.exe.config
-@@ -1,7 +1,7 @@
-
-
--
-
-+
-
-
-
---
diff -Nru keepass2-2.16+dfsg/debian/patches/remove-ToolsVersion-3.5.patch keepass2-2.18+dfsg/debian/patches/remove-ToolsVersion-3.5.patch
--- keepass2-2.16+dfsg/debian/patches/remove-ToolsVersion-3.5.patch 2011-10-08 18:46:57.000000000 +0000
+++ keepass2-2.18+dfsg/debian/patches/remove-ToolsVersion-3.5.patch 2012-01-06 07:14:04.000000000 +0000
@@ -9,7 +9,7 @@
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index 5ad0023..b32ac7e 100644
+index 3bcc038..73891d6 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
@@ -1,4 +1,4 @@
diff -Nru keepass2-2.16+dfsg/debian/patches/series keepass2-2.18+dfsg/debian/patches/series
--- keepass2-2.16+dfsg/debian/patches/series 2011-10-08 18:46:57.000000000 +0000
+++ keepass2-2.18+dfsg/debian/patches/series 2012-01-06 07:14:04.000000000 +0000
@@ -4,6 +4,6 @@
skip-sgen-run-during-build.patch
fix-XSL-search-path.patch
remove-ToolsVersion-3.5.patch
-prefer-4.0-framework-if-available.patch
enable-local-help.patch
-explicitly-PUT-for-webdav-writes.patch
+work-around-issues-with-autotype-and-keyboard-layout.patch
+disable-autoupdate-dialog.patch
diff -Nru keepass2-2.16+dfsg/debian/patches/skip-sgen-run-during-build.patch keepass2-2.18+dfsg/debian/patches/skip-sgen-run-during-build.patch
--- keepass2-2.16+dfsg/debian/patches/skip-sgen-run-during-build.patch 2011-10-08 18:46:57.000000000 +0000
+++ keepass2-2.18+dfsg/debian/patches/skip-sgen-run-during-build.patch 2012-01-06 07:14:04.000000000 +0000
@@ -4,21 +4,20 @@
Forwarded: not-needed
---
- KeePass/KeePass.csproj | 5 +----
- 1 files changed, 1 insertions(+), 4 deletions(-)
+ KeePass/KeePass.csproj | 3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index 68c0f5a..5ad0023 100644
+index 7ee2266..3bcc038 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
-@@ -1202,7 +1202,4 @@
+@@ -1241,7 +1241,4 @@
-->
-
-- "$(FrameworkSDKDir)bin\sgen.exe" /assembly:"$(TargetPath)" /force /nologo /compiler:/keycontainer:VS_KEY_E6D8E2B3F89DA59B /compiler:/delaysign-
+- "$(FrameworkSDKDir)bin\sgen.exe" /assembly:"$(TargetPath)" /force /nologo /compiler:/keycontainer:VS_KEY_33430356D8D7D1B8 /compiler:/delaysign-
-
--
+
\ No newline at end of file
-+
--
diff -Nru keepass2-2.16+dfsg/debian/patches/use-installed-ico-files.patch keepass2-2.18+dfsg/debian/patches/use-installed-ico-files.patch
--- keepass2-2.16+dfsg/debian/patches/use-installed-ico-files.patch 2011-10-08 18:46:57.000000000 +0000
+++ keepass2-2.18+dfsg/debian/patches/use-installed-ico-files.patch 2012-01-06 07:14:04.000000000 +0000
@@ -9,12 +9,14 @@
Forwarded: not-needed
---
KeePass/Forms/AboutForm.cs | 4 ++--
+ KeePass/Forms/AutoTypeCtxForm.cs | 2 +-
KeePass/Forms/CharPickerForm.cs | 2 +-
KeePass/Forms/ColumnsForm.cs | 2 +-
KeePass/Forms/DataEditorForm.cs | 2 +-
KeePass/Forms/DataViewerForm.cs | 2 +-
KeePass/Forms/DatabaseOperationsForm.cs | 2 +-
KeePass/Forms/DatabaseSettingsForm.cs | 2 +-
+ KeePass/Forms/DuplicationForm.cs | 2 +-
KeePass/Forms/EcasTriggerForm.cs | 2 +-
KeePass/Forms/EcasTriggersForm.cs | 2 +-
KeePass/Forms/EditAutoTypeItemForm.cs | 2 +-
@@ -47,15 +49,14 @@
KeePass/Forms/SingleLineEditForm.cs | 2 +-
KeePass/Forms/StatusLoggerForm.cs | 2 +-
KeePass/Forms/TanWizardForm.cs | 2 +-
+ KeePass/Forms/UpdateCheckForm.cs | 2 +-
KeePass/Forms/UrlSchemeForm.cs | 2 +-
KeePass/Forms/UrlSchemesForm.cs | 2 +-
- 41 files changed, 47 insertions(+), 47 deletions(-)
+ 44 files changed, 50 insertions(+), 50 deletions(-)
-diff --git a/KeePass/Forms/AboutForm.cs b/KeePass/Forms/AboutForm.cs
-index cb405c7..56d8d76 100644
--- a/KeePass/Forms/AboutForm.cs
+++ b/KeePass/Forms/AboutForm.cs
-@@ -56,11 +56,11 @@ namespace KeePass.Forms
+@@ -56,11 +56,11 @@
string strTitle = PwDefs.ProductName;
string strDesc = KPRes.Version + " " + PwDefs.VersionString;
@@ -67,13 +68,22 @@
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- m_lvComponents.Columns.Add(KPRes.Components, 100, HorizontalAlignment.Left);
+ m_lvComponents.Columns.Add(KPRes.Component, 100, HorizontalAlignment.Left);
m_lvComponents.Columns.Add(KPRes.Version, 100, HorizontalAlignment.Left);
-diff --git a/KeePass/Forms/CharPickerForm.cs b/KeePass/Forms/CharPickerForm.cs
-index 02386c1..202e84d 100644
+--- a/KeePass/Forms/AutoTypeCtxForm.cs
++++ b/KeePass/Forms/AutoTypeCtxForm.cs
+@@ -70,7 +70,7 @@
+
+ m_lblText.Text = KPRes.AutoTypeEntrySelectionDescLong;
+ this.Text = KPRes.AutoTypeEntrySelection;
+- this.Icon = Properties.Resources.KeePass;
++ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
+
+ string strRect = Program.Config.UI.AutoTypeCtxRect;
+ if(strRect.Length > 0) UIUtil.SetWindowScreenRect(this, strRect);
--- a/KeePass/Forms/CharPickerForm.cs
+++ b/KeePass/Forms/CharPickerForm.cs
-@@ -105,7 +105,7 @@ namespace KeePass.Forms
+@@ -106,7 +106,7 @@
m_fontChars = FontUtil.CreateFont("Tahoma", 8.25f, FontStyle.Bold);
@@ -82,11 +92,9 @@
this.Text = KPRes.PickCharacters + " - " + PwDefs.ShortProductName;
m_secWord.Attach(m_tbSelected, OnSelectedTextChangedEx, true);
-diff --git a/KeePass/Forms/ColumnsForm.cs b/KeePass/Forms/ColumnsForm.cs
-index e7ae02f..0fba326 100644
--- a/KeePass/Forms/ColumnsForm.cs
+++ b/KeePass/Forms/ColumnsForm.cs
-@@ -55,7 +55,7 @@ namespace KeePass.Forms
+@@ -57,7 +57,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_View_Detailed,
KPRes.ConfigureColumns, KPRes.ConfigureColumnsDesc);
@@ -95,11 +103,9 @@
this.Text = KPRes.ConfigureColumns;
int nWidth = (m_lvColumns.ClientRectangle.Width -
-diff --git a/KeePass/Forms/DataEditorForm.cs b/KeePass/Forms/DataEditorForm.cs
-index 7a4656c..224faeb 100644
--- a/KeePass/Forms/DataEditorForm.cs
+++ b/KeePass/Forms/DataEditorForm.cs
-@@ -92,7 +92,7 @@ namespace KeePass.Forms
+@@ -92,7 +92,7 @@
GlobalWindowManager.AddWindow(this);
@@ -108,11 +114,9 @@
this.DoubleBuffered = true;
string strRect = Program.Config.UI.DataEditorRect;
-diff --git a/KeePass/Forms/DataViewerForm.cs b/KeePass/Forms/DataViewerForm.cs
-index 35995c6..6431f1c 100644
--- a/KeePass/Forms/DataViewerForm.cs
+++ b/KeePass/Forms/DataViewerForm.cs
-@@ -71,7 +71,7 @@ namespace KeePass.Forms
+@@ -71,7 +71,7 @@
GlobalWindowManager.AddWindow(this);
@@ -121,11 +125,9 @@
m_tslViewer.Text = KPRes.ShowIn + ":";
m_tslEncoding.Text = KPRes.Encoding + ":";
-diff --git a/KeePass/Forms/DatabaseOperationsForm.cs b/KeePass/Forms/DatabaseOperationsForm.cs
-index 6353158..96dfcf1 100644
--- a/KeePass/Forms/DatabaseOperationsForm.cs
+++ b/KeePass/Forms/DatabaseOperationsForm.cs
-@@ -61,7 +61,7 @@ namespace KeePass.Forms
+@@ -61,7 +61,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Package_Settings, KPRes.DatabaseMaintenance,
KPRes.DatabaseMaintenanceDesc);
@@ -134,11 +136,9 @@
this.Text = KPRes.DatabaseMaintenance;
m_numHistoryDays.Value = m_pwDatabase.MaintenanceHistoryDays;
-diff --git a/KeePass/Forms/DatabaseSettingsForm.cs b/KeePass/Forms/DatabaseSettingsForm.cs
-index c386771..bc1ef23 100644
--- a/KeePass/Forms/DatabaseSettingsForm.cs
+++ b/KeePass/Forms/DatabaseSettingsForm.cs
-@@ -77,7 +77,7 @@ namespace KeePass.Forms
+@@ -78,7 +78,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Ark, KPRes.DatabaseSettings,
KPRes.DatabaseSettingsDesc);
@@ -147,11 +147,20 @@
m_bInitializing = true;
-diff --git a/KeePass/Forms/EcasTriggerForm.cs b/KeePass/Forms/EcasTriggerForm.cs
-index d8bc8c4..8b76f82 100644
+--- a/KeePass/Forms/DuplicationForm.cs
++++ b/KeePass/Forms/DuplicationForm.cs
+@@ -54,7 +54,7 @@
+ {
+ GlobalWindowManager.AddWindow(this);
+
+- this.Icon = Properties.Resources.KeePass;
++ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
+
+ FontUtil.AssignDefaultBold(m_cbAppendCopy);
+ FontUtil.AssignDefaultBold(m_cbFieldRefs);
--- a/KeePass/Forms/EcasTriggerForm.cs
+++ b/KeePass/Forms/EcasTriggerForm.cs
-@@ -67,7 +67,7 @@ namespace KeePass.Forms
+@@ -67,7 +67,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Run, strTitle, strDesc);
this.Text = strTitle;
@@ -160,11 +169,9 @@
m_lvEvents.SmallImageList = m_ilIcons;
m_lvConditions.SmallImageList = m_ilIcons;
-diff --git a/KeePass/Forms/EcasTriggersForm.cs b/KeePass/Forms/EcasTriggersForm.cs
-index a5222b7..e0f3b36 100644
--- a/KeePass/Forms/EcasTriggersForm.cs
+++ b/KeePass/Forms/EcasTriggersForm.cs
-@@ -82,7 +82,7 @@ namespace KeePass.Forms
+@@ -82,7 +82,7 @@
Properties.Resources.B48x48_Make_KDevelop, KPRes.Triggers,
KPRes.TriggersDesc);
this.Text = KPRes.Triggers;
@@ -173,11 +180,9 @@
int nWidth = (m_lvTriggers.ClientSize.Width - UIUtil.GetVScrollBarWidth() - 1);
m_lvTriggers.Columns.Add(KPRes.Triggers, nWidth);
-diff --git a/KeePass/Forms/EditAutoTypeItemForm.cs b/KeePass/Forms/EditAutoTypeItemForm.cs
-index f6f65b0..9683773 100644
--- a/KeePass/Forms/EditAutoTypeItemForm.cs
+++ b/KeePass/Forms/EditAutoTypeItemForm.cs
-@@ -118,7 +118,7 @@ namespace KeePass.Forms
+@@ -121,7 +121,7 @@
KPRes.ConfigureKeystrokeSeqDesc);
}
@@ -186,24 +191,20 @@
UIUtil.EnableAutoCompletion(m_cmbWindow, false);
-diff --git a/KeePass/Forms/EditStringForm.cs b/KeePass/Forms/EditStringForm.cs
-index e8acc06..e76a0fa 100644
--- a/KeePass/Forms/EditStringForm.cs
+++ b/KeePass/Forms/EditStringForm.cs
-@@ -94,7 +94,7 @@ namespace KeePass.Forms
+@@ -93,7 +93,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Font, strTitle, strDesc);
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- m_clrNormalBackground = m_cmbStringName.BackColor;
-
-diff --git a/KeePass/Forms/EntropyForm.cs b/KeePass/Forms/EntropyForm.cs
-index aa53f6b..33b808e 100644
+ UIUtil.EnableAutoCompletion(m_cmbStringName, true);
+ UIUtil.PrepareStandardMultilineControl(m_richStringValue, true, true);
--- a/KeePass/Forms/EntropyForm.cs
+++ b/KeePass/Forms/EntropyForm.cs
-@@ -71,7 +71,7 @@ namespace KeePass.Forms
+@@ -71,7 +71,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Binary, KPRes.EntropyTitle,
KPRes.EntropyDesc);
@@ -212,11 +213,9 @@
this.Text = KPRes.EntropyTitle;
UpdateUIState();
-diff --git a/KeePass/Forms/EntryListForm.cs b/KeePass/Forms/EntryListForm.cs
-index c260656..2eed07e 100644
--- a/KeePass/Forms/EntryListForm.cs
+++ b/KeePass/Forms/EntryListForm.cs
-@@ -87,7 +87,7 @@ namespace KeePass.Forms
+@@ -87,7 +87,7 @@
m_imgIcon, m_strTitle, m_strDescShort);
m_lblText.Text = m_strDescLong;
this.Text = m_strTitle;
@@ -225,11 +224,9 @@
if(m_ilIcons != null) m_lvEntries.SmallImageList = m_ilIcons;
else m_ilIcons = new ImageList();
-diff --git a/KeePass/Forms/EntryReportForm.cs b/KeePass/Forms/EntryReportForm.cs
-index 469b413..c805245 100644
--- a/KeePass/Forms/EntryReportForm.cs
+++ b/KeePass/Forms/EntryReportForm.cs
-@@ -51,7 +51,7 @@ namespace KeePass.Forms
+@@ -51,7 +51,7 @@
private void OnFormLoad(object sender, EventArgs e)
{
@@ -238,11 +235,9 @@
if(!string.IsNullOrEmpty(m_strTitle)) this.Text = m_strTitle;
else m_strTitle = PwDefs.ShortProductName;
-diff --git a/KeePass/Forms/ExchangeDataForm.cs b/KeePass/Forms/ExchangeDataForm.cs
-index 869abc5..dfaf4bb 100644
--- a/KeePass/Forms/ExchangeDataForm.cs
+++ b/KeePass/Forms/ExchangeDataForm.cs
-@@ -98,7 +98,7 @@ namespace KeePass.Forms
+@@ -98,7 +98,7 @@
Properties.Resources.B48x48_Folder_Download);
BannerFactory.CreateBannerEx(this, m_bannerImage,
bmpBanner, strWndTitle, strWndDesc);
@@ -251,11 +246,9 @@
this.Text = strWndTitle;
-diff --git a/KeePass/Forms/FieldRefForm.cs b/KeePass/Forms/FieldRefForm.cs
-index 2ce5e06..a2842fc 100644
--- a/KeePass/Forms/FieldRefForm.cs
+++ b/KeePass/Forms/FieldRefForm.cs
-@@ -68,7 +68,7 @@ namespace KeePass.Forms
+@@ -68,7 +68,7 @@
GlobalWindowManager.AddWindow(this);
@@ -263,12 +256,10 @@
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
UIUtil.SetExplorerTheme(m_lvEntries.Handle);
-
-diff --git a/KeePass/Forms/FileBrowserForm.cs b/KeePass/Forms/FileBrowserForm.cs
-index a75cf76..9b0d31c 100644
+ if(UISystemFonts.ListFont != null)
--- a/KeePass/Forms/FileBrowserForm.cs
+++ b/KeePass/Forms/FileBrowserForm.cs
-@@ -93,7 +93,7 @@ namespace KeePass.Forms
+@@ -93,7 +93,7 @@
{
GlobalWindowManager.AddWindow(this);
@@ -277,11 +268,9 @@
this.Text = m_strTitle;
m_nIconDim = m_tvFolders.ItemHeight;
-diff --git a/KeePass/Forms/GroupForm.cs b/KeePass/Forms/GroupForm.cs
-index 969c788..1c0716a 100644
--- a/KeePass/Forms/GroupForm.cs
+++ b/KeePass/Forms/GroupForm.cs
-@@ -66,7 +66,7 @@ namespace KeePass.Forms
+@@ -66,7 +66,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Txt, KPRes.EditGroup,
KPRes.EditGroupDesc);
@@ -290,11 +279,9 @@
UIUtil.SetButtonImage(m_btnAutoTypeEdit,
Properties.Resources.B16x16_Wizard, true);
-diff --git a/KeePass/Forms/HelpSourceForm.cs b/KeePass/Forms/HelpSourceForm.cs
-index 85265b4..2e5411e 100644
--- a/KeePass/Forms/HelpSourceForm.cs
+++ b/KeePass/Forms/HelpSourceForm.cs
-@@ -47,7 +47,7 @@ namespace KeePass.Forms
+@@ -47,7 +47,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Download, KPRes.HelpSourceSelection,
KPRes.HelpSourceSelectionDesc);
@@ -303,11 +290,9 @@
this.Text = KPRes.HelpSourceSelection;
FontUtil.AssignDefaultBold(m_radioLocal);
-diff --git a/KeePass/Forms/IOConnectionForm.cs b/KeePass/Forms/IOConnectionForm.cs
-index 2668a19..65d530a 100644
--- a/KeePass/Forms/IOConnectionForm.cs
+++ b/KeePass/Forms/IOConnectionForm.cs
-@@ -75,7 +75,7 @@ namespace KeePass.Forms
+@@ -75,7 +75,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
KeePass.Properties.Resources.B48x48_WWW, strTitle, strDesc);
@@ -316,11 +301,9 @@
this.Text = strTitle;
FontUtil.AssignDefaultBold(m_lblUrl);
-diff --git a/KeePass/Forms/IconPickerForm.cs b/KeePass/Forms/IconPickerForm.cs
-index 70bdafc..ec3596d 100644
--- a/KeePass/Forms/IconPickerForm.cs
+++ b/KeePass/Forms/IconPickerForm.cs
-@@ -79,7 +79,7 @@ namespace KeePass.Forms
+@@ -79,7 +79,7 @@
GlobalWindowManager.AddWindow(this);
@@ -329,11 +312,9 @@
FontUtil.AssignDefaultBold(m_radioStandard);
FontUtil.AssignDefaultBold(m_radioCustom);
-diff --git a/KeePass/Forms/ImportCsvForm.cs b/KeePass/Forms/ImportCsvForm.cs
-index 766c60f..51e8aa9 100644
--- a/KeePass/Forms/ImportCsvForm.cs
+++ b/KeePass/Forms/ImportCsvForm.cs
-@@ -69,7 +69,7 @@ namespace KeePass.Forms
+@@ -69,7 +69,7 @@
GlobalWindowManager.AddWindow(this);
@@ -342,11 +323,9 @@
m_bBlockChangedEvent = true;
-diff --git a/KeePass/Forms/ImportMethodForm.cs b/KeePass/Forms/ImportMethodForm.cs
-index 67c266a..d9916b6 100644
--- a/KeePass/Forms/ImportMethodForm.cs
+++ b/KeePass/Forms/ImportMethodForm.cs
-@@ -56,7 +56,7 @@ namespace KeePass.Forms
+@@ -56,7 +56,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Download, KPRes.ImportBehavior,
KPRes.ImportBehaviorDesc);
@@ -355,11 +334,9 @@
this.Text = KPRes.ImportBehavior;
-diff --git a/KeePass/Forms/InternalBrowserForm.cs b/KeePass/Forms/InternalBrowserForm.cs
-index f8fc293..428a4cb 100644
--- a/KeePass/Forms/InternalBrowserForm.cs
+++ b/KeePass/Forms/InternalBrowserForm.cs
-@@ -53,7 +53,7 @@ namespace KeePass.Forms
+@@ -53,7 +53,7 @@
{
GlobalWindowManager.AddWindow(this);
@@ -368,11 +345,9 @@
if(m_strInitialUrl.Length > 0)
m_webBrowser.Navigate(m_strInitialUrl);
-diff --git a/KeePass/Forms/KeyCreationForm.cs b/KeePass/Forms/KeyCreationForm.cs
-index d963bf1..05948b7 100644
--- a/KeePass/Forms/KeyCreationForm.cs
+++ b/KeePass/Forms/KeyCreationForm.cs
-@@ -79,7 +79,7 @@ namespace KeePass.Forms
+@@ -78,7 +78,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_KGPG_Sign, KPRes.CreateMasterKey,
m_ioInfo.GetDisplayName());
@@ -381,11 +356,9 @@
this.Text = KPRes.CreateMasterKey;
FontUtil.AssignDefaultBold(m_cbPassword);
-diff --git a/KeePass/Forms/KeyPromptForm.cs b/KeePass/Forms/KeyPromptForm.cs
-index f261e5d..e3a89a4 100644
--- a/KeePass/Forms/KeyPromptForm.cs
+++ b/KeePass/Forms/KeyPromptForm.cs
-@@ -115,7 +115,7 @@ namespace KeePass.Forms
+@@ -115,7 +115,7 @@
string strBannerDesc = WinUtil.CompactPath(m_ioInfo.Path, 45);
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_KGPG_Key2, strBannerTitle, strBannerDesc);
@@ -394,11 +367,9 @@
FontUtil.AssignDefaultBold(m_cbPassword);
FontUtil.AssignDefaultBold(m_cbKeyFile);
-diff --git a/KeePass/Forms/LanguageForm.cs b/KeePass/Forms/LanguageForm.cs
-index 4cf052f..1d9d009 100644
--- a/KeePass/Forms/LanguageForm.cs
+++ b/KeePass/Forms/LanguageForm.cs
-@@ -54,7 +54,7 @@ namespace KeePass.Forms
+@@ -54,7 +54,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Keyboard_Layout,
KPRes.SelectLanguage, KPRes.SelectLanguageDesc);
@@ -407,11 +378,9 @@
this.Text = KPRes.SelectLanguage;
int nWidth = m_lvLanguages.ClientRectangle.Width / 4;
-diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs
-index c4cc042..3192dac 100644
--- a/KeePass/Forms/MainForm.cs
+++ b/KeePass/Forms/MainForm.cs
-@@ -126,7 +126,7 @@ namespace KeePass.Forms
+@@ -140,7 +140,7 @@
m_strNeverExpiresText = KPRes.NeverExpires;
this.Text = PwDefs.ProductName;
@@ -420,11 +389,9 @@
m_imgFileSaveEnabled = Properties.Resources.B16x16_FileSave;
m_imgFileSaveDisabled = Properties.Resources.B16x16_FileSave_Disabled;
// m_imgFileSaveAllEnabled = Properties.Resources.B16x16_File_SaveAll;
-diff --git a/KeePass/Forms/MainForm_Functions.cs b/KeePass/Forms/MainForm_Functions.cs
-index 8756d22..813724b 100644
--- a/KeePass/Forms/MainForm_Functions.cs
+++ b/KeePass/Forms/MainForm_Functions.cs
-@@ -382,12 +382,12 @@ namespace KeePass.Forms
+@@ -402,12 +402,12 @@
strNtfPre.Length);
Icon icoDisposable, icoAssignable;
@@ -439,7 +406,7 @@
KPRes.Locked);
NativeMethods.EnableWindowPeekPreview(this.Handle, false);
}
-@@ -397,7 +397,7 @@ namespace KeePass.Forms
+@@ -417,7 +417,7 @@
strNtfText = strWindowText;
Icon icoDisposable, icoAssignable;
@@ -448,7 +415,7 @@
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -427,7 +427,7 @@ namespace KeePass.Forms
+@@ -447,7 +447,7 @@
m_docMgr.ActiveDatabase.IOConnectionInfo.Path, 63 - strNtfPre.Length);
Icon icoDisposable, icoAssignable;
@@ -457,7 +424,7 @@
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -442,7 +442,7 @@ namespace KeePass.Forms
+@@ -462,7 +462,7 @@
m_ntfTray.Text = StrUtil.CompactString3Dots(strNtfText, 63);
Icon icoToDispose, icoToAssign;
@@ -466,21 +433,19 @@
ref m_kvpIcoMain, out icoToAssign, out icoToDispose))
this.Icon = icoToAssign;
if(icoToDispose != null) icoToDispose.Dispose();
-@@ -3377,7 +3377,7 @@ namespace KeePass.Forms
+@@ -3503,7 +3503,7 @@
// wasn't fully constructed at that time yet)
- if(IsFileLocked(null))
- TaskbarList.SetOverlayIcon(this,
-- Properties.Resources.LockOverlay, KPRes.Locked);
-+ new Icon("/usr/share/keepass2/LockOverlay.ico"), KPRes.Locked);
+ // if(IsFileLocked(null))
+ // TaskbarList.SetOverlayIcon(this,
+- // Properties.Resources.LockOverlay, KPRes.Locked);
++ // new Icon("/usr/share/keepass2/LockOverlay.ico"), KPRes.Locked);
}
if(Program.Config.MainWindow.MinimizeToTray) MinimizeToTray(true);
-diff --git a/KeePass/Forms/OptionsForm.cs b/KeePass/Forms/OptionsForm.cs
-index c0ba1d2..ed67e7d 100644
--- a/KeePass/Forms/OptionsForm.cs
+++ b/KeePass/Forms/OptionsForm.cs
-@@ -104,7 +104,7 @@ namespace KeePass.Forms
- {
+@@ -107,7 +107,7 @@
+
GlobalWindowManager.AddWindow(this);
- this.Icon = Properties.Resources.KeePass;
@@ -488,11 +453,9 @@
Debug.Assert(m_ilIcons != null);
if(m_ilIcons != null)
-diff --git a/KeePass/Forms/PluginsForm.cs b/KeePass/Forms/PluginsForm.cs
-index 9aa6461..6d87c22 100644
--- a/KeePass/Forms/PluginsForm.cs
+++ b/KeePass/Forms/PluginsForm.cs
-@@ -64,7 +64,7 @@ namespace KeePass.Forms
+@@ -64,7 +64,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_BlockDevice, KPRes.Plugins,
KPRes.PluginsDesc);
@@ -501,11 +464,9 @@
m_cbCacheDeleteOld.Checked = Program.Config.Application.Start.PluginCacheDeleteOld;
-diff --git a/KeePass/Forms/PrintForm.cs b/KeePass/Forms/PrintForm.cs
-index 9f323ea..c9864bd 100644
--- a/KeePass/Forms/PrintForm.cs
+++ b/KeePass/Forms/PrintForm.cs
-@@ -94,7 +94,7 @@ namespace KeePass.Forms
+@@ -95,7 +95,7 @@
GlobalWindowManager.AddWindow(this);
@@ -514,11 +475,9 @@
CreateDialogBanner();
UIUtil.SetButtonImage(m_btnConfigPrinter,
-diff --git a/KeePass/Forms/ProxyForm.cs b/KeePass/Forms/ProxyForm.cs
-index 7c65533..286d830 100644
--- a/KeePass/Forms/ProxyForm.cs
+++ b/KeePass/Forms/ProxyForm.cs
-@@ -44,7 +44,7 @@ namespace KeePass.Forms
+@@ -44,7 +44,7 @@
{
GlobalWindowManager.AddWindow(this);
@@ -527,11 +486,9 @@
ProxyServerType pst = Program.Config.Integration.ProxyType;
if(pst == ProxyServerType.None) m_rbNoProxy.Checked = true;
-diff --git a/KeePass/Forms/PwEntryForm.cs b/KeePass/Forms/PwEntryForm.cs
-index b79f7a2..42e282a 100644
--- a/KeePass/Forms/PwEntryForm.cs
+++ b/KeePass/Forms/PwEntryForm.cs
-@@ -550,7 +550,7 @@ namespace KeePass.Forms
+@@ -550,7 +550,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
KeePass.Properties.Resources.B48x48_KGPG_Sign, strTitle, strDesc);
@@ -540,11 +497,9 @@
this.Text = strTitle;
UIUtil.SetButtonImage(m_btnTools,
-diff --git a/KeePass/Forms/PwGeneratorForm.cs b/KeePass/Forms/PwGeneratorForm.cs
-index 22f0c8c..2e9043b 100644
--- a/KeePass/Forms/PwGeneratorForm.cs
+++ b/KeePass/Forms/PwGeneratorForm.cs
-@@ -90,7 +90,7 @@ namespace KeePass.Forms
+@@ -90,7 +90,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_KGPG_Gen, KPRes.PasswordOptions,
KPRes.PasswordOptionsDesc);
@@ -553,24 +508,20 @@
UIUtil.SetButtonImage(m_btnProfileAdd,
Properties.Resources.B16x16_FileSaveAs, false);
-diff --git a/KeePass/Forms/SearchForm.cs b/KeePass/Forms/SearchForm.cs
-index 9082a87..80130ca 100644
--- a/KeePass/Forms/SearchForm.cs
+++ b/KeePass/Forms/SearchForm.cs
-@@ -89,7 +89,7 @@ namespace KeePass.Forms
+@@ -92,7 +92,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_XMag, strTitle, KPRes.SearchDesc);
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- SearchParameters sp = Program.Config.Defaults.SearchParameters;
- m_cbTitle.Checked = sp.SearchInTitles;
-diff --git a/KeePass/Forms/SingleLineEditForm.cs b/KeePass/Forms/SingleLineEditForm.cs
-index 58b7802..68fc9a6 100644
+ m_cbDerefData.Text = m_cbDerefData.Text + " (" + KPRes.Slow + ")";
+
--- a/KeePass/Forms/SingleLineEditForm.cs
+++ b/KeePass/Forms/SingleLineEditForm.cs
-@@ -73,7 +73,7 @@ namespace KeePass.Forms
+@@ -73,7 +73,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
m_imgIcon, m_strTitle, m_strDesc);
@@ -579,11 +530,9 @@
this.Text = m_strTitle;
m_lblLongDesc.Text = m_strLongDesc;
-diff --git a/KeePass/Forms/StatusLoggerForm.cs b/KeePass/Forms/StatusLoggerForm.cs
-index 86e9e95..ebb9cc7 100644
--- a/KeePass/Forms/StatusLoggerForm.cs
+++ b/KeePass/Forms/StatusLoggerForm.cs
-@@ -124,7 +124,7 @@ namespace KeePass.Forms
+@@ -124,7 +124,7 @@
{
GlobalWindowManager.AddWindow(this);
@@ -592,11 +541,9 @@
this.Text = PwDefs.ShortProductName;
m_pbProgress.Minimum = 0;
-diff --git a/KeePass/Forms/TanWizardForm.cs b/KeePass/Forms/TanWizardForm.cs
-index 5e5f8ab..7dc89c4 100644
--- a/KeePass/Forms/TanWizardForm.cs
+++ b/KeePass/Forms/TanWizardForm.cs
-@@ -61,7 +61,7 @@ namespace KeePass.Forms
+@@ -61,7 +61,7 @@
KeePass.Properties.Resources.B48x48_Wizard, KPRes.TanWizard,
KPRes.TanWizardDesc);
@@ -605,11 +552,20 @@
this.Text = KPRes.TanWizard;
if((m_pgStorage.Name != null) && (m_pgStorage.Name.Length > 0))
-diff --git a/KeePass/Forms/UrlSchemeForm.cs b/KeePass/Forms/UrlSchemeForm.cs
-index 4ff62a8..6b88f6d 100644
+--- a/KeePass/Forms/UpdateCheckForm.cs
++++ b/KeePass/Forms/UpdateCheckForm.cs
+@@ -64,7 +64,7 @@
+ BannerFactory.CreateBannerEx(this, m_bannerImage,
+ Properties.Resources.B48x48_WWW, KPRes.UpdateCheck,
+ KPRes.UpdateCheckResults);
+- this.Icon = Properties.Resources.KeePass;
++ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
+ this.Text = KPRes.UpdateCheck + " - " + PwDefs.ShortProductName;
+
+ // UIUtil.SetExplorerTheme(m_lvInfo.Handle);
--- a/KeePass/Forms/UrlSchemeForm.cs
+++ b/KeePass/Forms/UrlSchemeForm.cs
-@@ -51,7 +51,7 @@ namespace KeePass.Forms
+@@ -51,7 +51,7 @@
GlobalWindowManager.AddWindow(this);
@@ -618,11 +574,9 @@
this.Text = KPRes.UrlSchemeOverride;
m_tbScheme.Text = m_ovr.Scheme;
-diff --git a/KeePass/Forms/UrlSchemesForm.cs b/KeePass/Forms/UrlSchemesForm.cs
-index eadc777..c605501 100644
--- a/KeePass/Forms/UrlSchemesForm.cs
+++ b/KeePass/Forms/UrlSchemesForm.cs
-@@ -54,7 +54,7 @@ namespace KeePass.Forms
+@@ -54,7 +54,7 @@
GlobalWindowManager.AddWindow(this);
@@ -630,5 +584,4 @@
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
this.Text = KPRes.UrlSchemeOverrides;
- int nWidth = (m_lvOverrides.ClientSize.Width - UIUtil.GetVScrollBarWidth()) / 4;
---
+ UIUtil.SetExplorerTheme(m_lvOverrides.Handle);
diff -Nru keepass2-2.16+dfsg/debian/patches/use-the-mono-signing-key.patch keepass2-2.18+dfsg/debian/patches/use-the-mono-signing-key.patch
--- keepass2-2.16+dfsg/debian/patches/use-the-mono-signing-key.patch 2011-10-08 18:46:57.000000000 +0000
+++ keepass2-2.18+dfsg/debian/patches/use-the-mono-signing-key.patch 2012-01-06 07:14:04.000000000 +0000
@@ -9,7 +9,7 @@
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
-index cddd7d2..68c0f5a 100644
+index 9cd0069..7ee2266 100644
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
@@ -11,7 +11,7 @@
@@ -22,7 +22,7 @@
2.0
diff --git a/KeePassLib/KeePassLib.csproj b/KeePassLib/KeePassLib.csproj
-index a127a30..0a9c332 100644
+index 016e0c1..caeae4d 100644
--- a/KeePassLib/KeePassLib.csproj
+++ b/KeePassLib/KeePassLib.csproj
@@ -10,7 +10,7 @@
diff -Nru keepass2-2.16+dfsg/debian/patches/work-around-issues-with-autotype-and-keyboard-layout.patch keepass2-2.18+dfsg/debian/patches/work-around-issues-with-autotype-and-keyboard-layout.patch
--- keepass2-2.16+dfsg/debian/patches/work-around-issues-with-autotype-and-keyboard-layout.patch 1970-01-01 00:00:00.000000000 +0000
+++ keepass2-2.18+dfsg/debian/patches/work-around-issues-with-autotype-and-keyboard-layout.patch 2012-01-06 07:14:04.000000000 +0000
@@ -0,0 +1,28 @@
+From: Julian Taylor
+Date: Tue, 25 Oct 2011 21:08:14 +0200
+Subject: work around issues with autotype and keyboard layouts
+
+for some reason unicode codes works better
+---
+ KeePass/Util/SendInputEx.Unix.cs | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/KeePass/Util/SendInputEx.Unix.cs b/KeePass/Util/SendInputEx.Unix.cs
+index e30599f..c9ee4a3 100644
+--- a/KeePass/Util/SendInputEx.Unix.cs
++++ b/KeePass/Util/SendInputEx.Unix.cs
+@@ -181,9 +181,11 @@ namespace KeePass.Util
+ if(strString.Length == 0) return;
+
+ if(kMod != Keys.None)
+- NativeMethods.RunXDoTool(@"type '" + strString + @"'");
++ foreach(char c in strString)
++ NativeMethods.RunXDoTool(@"key U" + ((int)c).ToString("x4"));
+ else
+- NativeMethods.RunXDoTool(@"type --clearmodifiers '" + strString + @"'");
++ foreach(char c in strString)
++ NativeMethods.RunXDoTool(@"key --clearmodifiers U" + ((int)c).ToString("x4"));
+
+ ClearModifiers(ref kMod);
+ }
+--
diff -Nru keepass2-2.16+dfsg/debian/README.Debian keepass2-2.18+dfsg/debian/README.Debian
--- keepass2-2.16+dfsg/debian/README.Debian 2011-10-08 18:46:57.000000000 +0000
+++ keepass2-2.18+dfsg/debian/README.Debian 2012-01-06 07:14:04.000000000 +0000
@@ -20,5 +20,5 @@
To execute KeePass plugin like KPScript one must currently set the MONO_PATH
environment variable to /usr/lib/keepass2.
E.g. in Bash:
- MONO_PATH="/usr/lib/keepass2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+ MONO_PATH="/usr/lib/keepass2${MONO_PATH:+:$MONO_PATH}"
export MONO_PATH
diff -Nru keepass2-2.16+dfsg/Docs/Chm/default.css keepass2-2.18+dfsg/Docs/Chm/default.css
--- keepass2-2.16+dfsg/Docs/Chm/default.css 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/default.css 2012-01-05 09:37:16.000000000 +0000
@@ -1,5 +1,5 @@
/*
- Design Copyright (c) 2003-2011 Dominik Reichl
+ Design Copyright (c) 2003-2012 Dominik Reichl
*/
body, p, div, h1, h2, h3, h4, h5, h6, ol, ul, li, td, th, dd, dt, a {
diff -Nru keepass2-2.16+dfsg/Docs/Chm/help/base/autotype.html keepass2-2.18+dfsg/Docs/Chm/help/base/autotype.html
--- keepass2-2.16+dfsg/Docs/Chm/help/base/autotype.html 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/help/base/autotype.html 2012-01-05 09:37:16.000000000 +0000
@@ -25,7 +25,7 @@
-
+
Auto-Type - KeePass
diff -Nru keepass2-2.16+dfsg/Docs/Chm/help/base/autourl.html keepass2-2.18+dfsg/Docs/Chm/help/base/autourl.html
--- keepass2-2.16+dfsg/Docs/Chm/help/base/autourl.html 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/help/base/autourl.html 2012-01-05 09:37:16.000000000 +0000
@@ -25,7 +25,7 @@
-
+
URL Field Capabilities - KeePass
@@ -142,6 +142,7 @@
cmd://{FIREFOX} "http://www.yoursite.com"
cmd://{OPERA} "http://www.yoursite.com"
cmd://{GOOGLECHROME} "http://www.yoursite.com"
+cmd://{SAFARI} "http://www.yoursite.com"
The browser placeholder will be replaced by the browser's executable path (if the
browser is installed).
diff -Nru keepass2-2.16+dfsg/Docs/Chm/help/base/cmdline.html keepass2-2.18+dfsg/Docs/Chm/help/base/cmdline.html
--- keepass2-2.16+dfsg/Docs/Chm/help/base/cmdline.html 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/help/base/cmdline.html 2012-01-05 09:37:16.000000000 +0000
@@ -25,7 +25,7 @@
-
+
Command Line Options - KeePass
diff -Nru keepass2-2.16+dfsg/Docs/Chm/help/base/configuration.html keepass2-2.18+dfsg/Docs/Chm/help/base/configuration.html
--- keepass2-2.16+dfsg/Docs/Chm/help/base/configuration.html 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/help/base/configuration.html 2012-01-05 09:37:16.000000000 +0000
@@ -25,7 +25,7 @@
-
+
Configuration - KeePass
diff -Nru keepass2-2.16+dfsg/Docs/Chm/help/base/credits.html keepass2-2.18+dfsg/Docs/Chm/help/base/credits.html
--- keepass2-2.16+dfsg/Docs/Chm/help/base/credits.html 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/help/base/credits.html 2012-01-05 09:37:16.000000000 +0000
@@ -25,7 +25,7 @@
-
+
Acknowledgements - KeePass
@@ -131,7 +131,8 @@
target="_blank">CSendKeys).
Bouncy Castle Developers |
@@ -174,11 +175,11 @@
Tools
Acknowledgements
-Thanks to the UPX Team for the writing the Ultimate Packer for
+
Thanks to Jordan Russell for creating Inno Setup. This
diff -Nru keepass2-2.16+dfsg/Docs/Chm/help/base/credits_icons_license.html keepass2-2.18+dfsg/Docs/Chm/help/base/credits_icons_license.html
--- keepass2-2.16+dfsg/Docs/Chm/help/base/credits_icons_license.html 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/help/base/credits_icons_license.html 2012-01-05 09:37:16.000000000 +0000
@@ -25,7 +25,7 @@
-
+
Acknowledgements - KeePass
diff -Nru keepass2-2.16+dfsg/Docs/Chm/help/base/disclaimer.html keepass2-2.18+dfsg/Docs/Chm/help/base/disclaimer.html
--- keepass2-2.16+dfsg/Docs/Chm/help/base/disclaimer.html 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/help/base/disclaimer.html 2012-01-05 09:37:16.000000000 +0000
@@ -25,7 +25,7 @@
-
+
Disclaimer
diff -Nru keepass2-2.16+dfsg/Docs/Chm/help/base/faq.html keepass2-2.18+dfsg/Docs/Chm/help/base/faq.html
--- keepass2-2.16+dfsg/Docs/Chm/help/base/faq.html 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/help/base/faq.html 2012-01-05 09:37:16.000000000 +0000
@@ -25,7 +25,7 @@
-
+
Administrative FAQ - KeePass
diff -Nru keepass2-2.16+dfsg/Docs/Chm/help/base/faq_tech.html keepass2-2.18+dfsg/Docs/Chm/help/base/faq_tech.html
--- keepass2-2.16+dfsg/Docs/Chm/help/base/faq_tech.html 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/help/base/faq_tech.html 2012-01-05 09:37:16.000000000 +0000
@@ -25,7 +25,7 @@
-
+
Technical FAQ - KeePass
@@ -81,7 +81,7 @@
Could you add the ... encryption algorithm to KeePass?
Why doesn't KeePass lock when Windows locks and a KeePass sub-dialog is open?
Printing creates a temporary file. Will it be erased securely?
-Why KeePass 2.x resets in-memory protection options?
+
Why the estimated quality of a password suddenly drops?
@@ -154,7 +154,7 @@
Alternative, not recommended resolution:
Configure the security policy to allow running .NET applications from
network drives/shares. Ask your administrator to do this (administrative
-rights are required). If you got administrative rights and want to do
+rights are required). If you have administrative rights and want to do
it yourself, you can use the
Code Access Security Policy Tool (Caspol.exe)
@@ -513,7 +513,7 @@
-
+
diff -Nru keepass2-2.16+dfsg/Docs/Chm/help/base/fieldrefs.html keepass2-2.18+dfsg/Docs/Chm/help/base/fieldrefs.html
--- keepass2-2.16+dfsg/Docs/Chm/help/base/fieldrefs.html 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/help/base/fieldrefs.html 2012-01-05 09:37:16.000000000 +0000
@@ -25,7 +25,7 @@
-
+
Field References - KeePass
diff -Nru keepass2-2.16+dfsg/Docs/Chm/help/base/firststeps.html keepass2-2.18+dfsg/Docs/Chm/help/base/firststeps.html
--- keepass2-2.16+dfsg/Docs/Chm/help/base/firststeps.html 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/help/base/firststeps.html 2012-01-05 09:37:16.000000000 +0000
@@ -25,7 +25,7 @@
-
+
First Steps Tutorial - KeePass
diff -Nru keepass2-2.16+dfsg/Docs/Chm/help/base/importexport.html keepass2-2.18+dfsg/Docs/Chm/help/base/importexport.html
--- keepass2-2.16+dfsg/Docs/Chm/help/base/importexport.html 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/help/base/importexport.html 2012-01-05 09:37:16.000000000 +0000
@@ -25,7 +25,7 @@
-
+
File Formats - KeePass
diff -Nru keepass2-2.16+dfsg/Docs/Chm/help/base/index.html keepass2-2.18+dfsg/Docs/Chm/help/base/index.html
--- keepass2-2.16+dfsg/Docs/Chm/help/base/index.html 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/help/base/index.html 2012-01-05 09:37:16.000000000 +0000
@@ -25,7 +25,7 @@
-
+
Help Center - KeePass
@@ -56,7 +56,7 @@
-KeePass: Copyright © 2003-2011 Dominik Reichl. The program is OSI Certified
+
KeePass: Copyright © 2003-2012 Dominik Reichl. The program is OSI Certified
Open Source Software. OSI Certified is a certification mark of the Open Source Initiative.
For more information see the
diff -Nru keepass2-2.16+dfsg/Docs/Chm/help/base/integration.html keepass2-2.18+dfsg/Docs/Chm/help/base/integration.html
--- keepass2-2.16+dfsg/Docs/Chm/help/base/integration.html 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/help/base/integration.html 2012-01-05 09:37:16.000000000 +0000
@@ -25,7 +25,7 @@
-
+
Integration - KeePass
diff -Nru keepass2-2.16+dfsg/Docs/Chm/help/base/keys.html keepass2-2.18+dfsg/Docs/Chm/help/base/keys.html
--- keepass2-2.16+dfsg/Docs/Chm/help/base/keys.html 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/help/base/keys.html 2012-01-05 09:37:16.000000000 +0000
@@ -25,7 +25,7 @@
-
+
Composite Master Key - KeePass
@@ -171,20 +171,18 @@
damaged), it is not
enough to just create a new Windows account on the new installation with the
same name and password;
-you need to copy the complete account (i.e. SID, ...). This is not
+you need to copy the complete account (i.e. SID, ...). This is not
a simple task, so if you don't know how to do this, it is highly recommended
-that you don't enable this option.
+that you don't enable this option.
+Instructions on how to restore a backed up account can be found in a
+Microsoft TechNet article:
+How to recover a Vault corrupted by lost DPAPI keys.
If you decide to use this option, it is highly recommended not to rely
on it exclusively, but to additionally use one of the other two options (password
or key file).
-Triggers allow you to automatically export the database when you save. Saving in
-XML format provides a useful backup, but the export is in plain text, not
-encrypted. See the
-Trigger Examples
-for more details.
-
Protection using user accounts is unsupported on Windows 98 / ME.
diff -Nru keepass2-2.16+dfsg/Docs/Chm/help/base/license_lgpl.html keepass2-2.18+dfsg/Docs/Chm/help/base/license_lgpl.html
--- keepass2-2.16+dfsg/Docs/Chm/help/base/license_lgpl.html 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/help/base/license_lgpl.html 2012-01-05 09:37:16.000000000 +0000
@@ -25,7 +25,7 @@
-
+
LGPL License - KeePass
diff -Nru keepass2-2.16+dfsg/Docs/Chm/help/base/multiuser.html keepass2-2.18+dfsg/Docs/Chm/help/base/multiuser.html
--- keepass2-2.16+dfsg/Docs/Chm/help/base/multiuser.html 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/help/base/multiuser.html 2012-01-05 09:37:16.000000000 +0000
@@ -25,7 +25,7 @@
-
+
Multi-User - KeePass
diff -Nru keepass2-2.16+dfsg/Docs/Chm/help/base/placeholders.html keepass2-2.18+dfsg/Docs/Chm/help/base/placeholders.html
--- keepass2-2.16+dfsg/Docs/Chm/help/base/placeholders.html 2011-07-12 08:05:14.000000000 +0000
+++ keepass2-2.18+dfsg/Docs/Chm/help/base/placeholders.html 2012-01-05 09:37:16.000000000 +0000
@@ -25,7 +25,7 @@
-
+
Placeholders - KeePass
@@ -127,6 +127,7 @@
{FIREFOX} | Path of Mozilla Firefox, if installed. |
{OPERA} | Path of Opera, if installed. |
{GOOGLECHROME} | Path of Google Chrome, if installed. |
+{SAFARI} | Path of Safari, if installed. |
@@ -199,6 +200,7 @@
See below.
{HMACOTP} | Generates a one-time password.
See below. |
+{C:Comment} | Comment; is removed. |
@@ -259,8 +261,8 @@
A fixed number of
down arrow keypresses can be added by specifying them using the Conv-Offset
-option. For example, if you specify Conv=D, Conv-Offset=1
, '2', 'c' and 'C'
-are converted to 3 down arrow keypresses.
+option. For example, if you specify Conv=D, Conv-Offset=1
,
+then '2', 'c' and 'C' are converted to 3 down arrow keypresses.
By using the Conv-Fmt option, you can specify the layout of comboboxes.
By default, KeePass assumes a combobox containing values from 0 to 9 or from A to Z.
@@ -281,8 +283,10 @@
Usage examples:
{USERNAME}{TAB}{PICKCHARS:Password:C=5}{ENTER}
-Types the user name, presses Tab, allows the user to pick exactly 5 characters
-from the entry password, types these 5 characters, and presses Enter.
+First a dialog is shown in which the user can pick exactly 5 characters
+from the entry password.
+Afterwards KeePass types the user name into the target window, presses Tab,
+types the 5 picked characters and presses Enter.
-This first types the contents of a custom entry string named "Memorable",
-and presses Tab. Then the character picking dialog allows to pick exactly
-one character from the password, and this character is converted to
-down arrow keypresses (with one additional keypress, e.g. a '1' is converted
-to two down arrow keypresses), and the focus is switched to the next control
-by pressing Tab. This is repeated two more times
-(the IDs are different, thus the dialog is shown two more times).
+First the character picking dialog is shown three times and each time the user
+can pick exactly one character from the entry password.
+Afterwards the auto-type process starts:
+KeePass types the contents of a custom entry string named "Memorable"
+into the target window.
+The focus is switched to the next control by pressing Tab,
+and the first previously picked character is converted to
+down arrow keypresses (with one additional keypress; e.g. a '1' is converted
+to two down arrow keypresses).
+This is repeated two more times with the other picked characters,
+and finally Enter is pressed.
Note this is not equivalent to picking three characters at once.
If you'd use {S:Memorable}{TAB}{PICKCHARS:Password:C=3, Conv=D, Conv-Offset=1}
,
@@ -354,7 +362,20 @@
The shared secret is the UTF-8 representation of the value of the
'HmacOtp-Secret
' custom entry string field
(case-sensitive), and
-the counter is stored in decimal form in the 'HmacOtp-Counter
' field.
+the counter is stored in decimal form in the 'HmacOtp-Counter
' field.
+
+Usage example.
+Create a new entry, set its password to the {HMACOTP}
+placeholder, switch to the 'Advanced' tab, add a string named
+HmacOtp-Secret
with value 12345678901234567890,
+and add a string named HmacOtp-Counter
with value 0.
+When you now double-click onto the password cell of the entry in the
+entry list of the main window, an OTP is copied to the
+clipboard. When auto-typing, an OTP is sent as password.
+Each time you perform such an action, KeePass updates the counter value.
+With the secret key and counter values above, the following OTPs
+are generated: 755224, 287082, 359152, 969429, 338314, ...
+(more generated OTPs can be found in the example in RFC 4226).