Merge branch '1.13' into 1.14

4 files changed, 130 insertions, 34 deletions

diff --git a/paramiko/_winapi.py b/paramiko/_winapi.py
index 0d55d291..c67c2421 100644
--- a/paramiko/_winapi.py
+++ b/paramiko/_winapi.py
@@ -1,23 +1,16 @@
 """
 Windows API functions implemented as ctypes functions and classes as found
-in jaraco.windows (2.10).
+in jaraco.windows (3.3).
 
 If you encounter issues with this module, please consider reporting the issues
 in jaraco.windows and asking the author to port the fixes back here.
 """
 
-import ctypes
+import sys
 import ctypes.wintypes
-from paramiko.py3compat import u
-try:
-    import builtins
-except ImportError:
-    import __builtin__ as builtins
 
-try:
-    USHORT = ctypes.wintypes.USHORT
-except AttributeError:
-    USHORT = ctypes.c_ushort
+from paramiko.py3compat import u, builtins
+
 
 ######################
 # jaraco.windows.error
@@ -29,11 +22,7 @@ def format_system_message(errno):
     """
     # first some flags used by FormatMessageW
     ALLOCATE_BUFFER = 0x100
-    ARGUMENT_ARRAY = 0x2000
-    FROM_HMODULE = 0x800
-    FROM_STRING = 0x400
     FROM_SYSTEM = 0x1000
-    IGNORE_INSERTS = 0x200
 
     # Let FormatMessageW allocate the buffer (we'll free it below)
     # Also, let it know we want a system error message.
@@ -44,7 +33,7 @@ def format_system_message(errno):
     result_buffer = ctypes.wintypes.LPWSTR()
     buffer_size = 0
     arguments = None
-    format_bytes = ctypes.windll.kernel32.FormatMessageW(
+    bytes = ctypes.windll.kernel32.FormatMessageW(
         flags,
         source,
         message_id,
@@ -52,11 +41,11 @@ def format_system_message(errno):
         ctypes.byref(result_buffer),
         buffer_size,
         arguments,
-    )
+        )
     # note the following will cause an infinite loop if GetLastError
     #  repeatedly returns an error that cannot be formatted, although
     #  this should not happen.
-    handle_nonzero_success(format_bytes)
+    handle_nonzero_success(bytes)
     message = result_buffer.value
     ctypes.windll.kernel32.LocalFree(result_buffer)
     return message
@@ -69,7 +58,11 @@ class WindowsError(builtins.WindowsError):
         if value is None:
             value = ctypes.windll.kernel32.GetLastError()
         strerror = format_system_message(value)
-        super(WindowsError, self).__init__(value, strerror)
+        if sys.version_info > (3,3):
+            args = 0, strerror, None, value
+        else:
+            args = value, strerror
+        super(WindowsError, self).__init__(*args)
 
     @property
     def message(self):
@@ -90,6 +83,27 @@ def handle_nonzero_success(result):
         raise WindowsError()
 
 
+###########################
+# jaraco.windows.api.memory
+
+GMEM_MOVEABLE = 0x2
+
+GlobalAlloc = ctypes.windll.kernel32.GlobalAlloc
+GlobalAlloc.argtypes = ctypes.wintypes.UINT, ctypes.c_ssize_t
+GlobalAlloc.restype = ctypes.wintypes.HANDLE
+
+GlobalLock = ctypes.windll.kernel32.GlobalLock
+GlobalLock.argtypes = ctypes.wintypes.HGLOBAL,
+GlobalLock.restype = ctypes.wintypes.LPVOID
+
+GlobalUnlock = ctypes.windll.kernel32.GlobalUnlock
+GlobalUnlock.argtypes = ctypes.wintypes.HGLOBAL,
+GlobalUnlock.restype = ctypes.wintypes.BOOL
+
+GlobalSize = ctypes.windll.kernel32.GlobalSize
+GlobalSize.argtypes = ctypes.wintypes.HGLOBAL,
+GlobalSize.restype = ctypes.c_size_t
+
 CreateFileMapping = ctypes.windll.kernel32.CreateFileMappingW
 CreateFileMapping.argtypes = [
     ctypes.wintypes.HANDLE,
@@ -104,6 +118,9 @@ CreateFileMapping.restype = ctypes.wintypes.HANDLE
 MapViewOfFile = ctypes.windll.kernel32.MapViewOfFile
 MapViewOfFile.restype = ctypes.wintypes.HANDLE
 
+#####################
+# jaraco.windows.mmap
+
 class MemoryMap(object):
     """
     A memory map object which can have security attributes overrideden.
@@ -136,10 +153,13 @@ class MemoryMap(object):
         self.pos = pos
 
     def write(self, msg):
+        assert isinstance(msg, bytes)
         n = len(msg)
         if self.pos + n >= self.length:  # A little safety.
             raise ValueError("Refusing to write %d bytes" % n)
-        ctypes.windll.kernel32.RtlMoveMemory(self.view + self.pos, msg, n)
+        dest = self.view + self.pos
+        length = ctypes.wintypes.SIZE(n)
+        ctypes.windll.kernel32.RtlMoveMemory(dest, msg, length)
         self.pos += n
 
     def read(self, n):
@@ -147,7 +167,9 @@ class MemoryMap(object):
         Read n bytes from mapped view.
         """
         out = ctypes.create_string_buffer(n)
-        ctypes.windll.kernel32.RtlMoveMemory(out, self.view + self.pos, n)
+        source = self.view + self.pos
+        length = ctypes.wintypes.SIZE(n)
+        ctypes.windll.kernel32.RtlMoveMemory(out, source, length)
         self.pos += n
         return out.raw
 
@@ -155,8 +177,71 @@ class MemoryMap(object):
         ctypes.windll.kernel32.UnmapViewOfFile(self.view)
         ctypes.windll.kernel32.CloseHandle(self.filemap)
 
-#########################
-# jaraco.windows.security
+#############################
+# jaraco.windows.api.security
+
+# from WinNT.h
+READ_CONTROL = 0x00020000
+STANDARD_RIGHTS_REQUIRED = 0x000F0000
+STANDARD_RIGHTS_READ = READ_CONTROL
+STANDARD_RIGHTS_WRITE = READ_CONTROL
+STANDARD_RIGHTS_EXECUTE = READ_CONTROL
+STANDARD_RIGHTS_ALL = 0x001F0000
+
+# from NTSecAPI.h
+POLICY_VIEW_LOCAL_INFORMATION = 0x00000001
+POLICY_VIEW_AUDIT_INFORMATION = 0x00000002
+POLICY_GET_PRIVATE_INFORMATION = 0x00000004
+POLICY_TRUST_ADMIN = 0x00000008
+POLICY_CREATE_ACCOUNT = 0x00000010
+POLICY_CREATE_SECRET = 0x00000020
+POLICY_CREATE_PRIVILEGE = 0x00000040
+POLICY_SET_DEFAULT_QUOTA_LIMITS = 0x00000080
+POLICY_SET_AUDIT_REQUIREMENTS = 0x00000100
+POLICY_AUDIT_LOG_ADMIN = 0x00000200
+POLICY_SERVER_ADMIN = 0x00000400
+POLICY_LOOKUP_NAMES = 0x00000800
+POLICY_NOTIFICATION = 0x00001000
+
+POLICY_ALL_ACCESS = (
+    STANDARD_RIGHTS_REQUIRED |
+    POLICY_VIEW_LOCAL_INFORMATION |
+    POLICY_VIEW_AUDIT_INFORMATION |
+    POLICY_GET_PRIVATE_INFORMATION |
+    POLICY_TRUST_ADMIN |
+    POLICY_CREATE_ACCOUNT |
+    POLICY_CREATE_SECRET |
+    POLICY_CREATE_PRIVILEGE |
+    POLICY_SET_DEFAULT_QUOTA_LIMITS |
+    POLICY_SET_AUDIT_REQUIREMENTS |
+    POLICY_AUDIT_LOG_ADMIN |
+    POLICY_SERVER_ADMIN |
+    POLICY_LOOKUP_NAMES)
+
+
+POLICY_READ = (
+    STANDARD_RIGHTS_READ |
+    POLICY_VIEW_AUDIT_INFORMATION |
+    POLICY_GET_PRIVATE_INFORMATION)
+
+POLICY_WRITE = (
+    STANDARD_RIGHTS_WRITE |
+    POLICY_TRUST_ADMIN |
+    POLICY_CREATE_ACCOUNT |
+    POLICY_CREATE_SECRET |
+    POLICY_CREATE_PRIVILEGE |
+    POLICY_SET_DEFAULT_QUOTA_LIMITS |
+    POLICY_SET_AUDIT_REQUIREMENTS |
+    POLICY_AUDIT_LOG_ADMIN |
+    POLICY_SERVER_ADMIN)
+
+POLICY_EXECUTE = (
+    STANDARD_RIGHTS_EXECUTE |
+    POLICY_VIEW_LOCAL_INFORMATION |
+    POLICY_LOOKUP_NAMES)
+
+class TokenAccess:
+    TOKEN_QUERY = 0x8
 
 class TokenInformationClass:
     TokenUser = 1
@@ -182,7 +267,7 @@ class SECURITY_DESCRIPTOR(ctypes.Structure):
         PACL Dacl;
         }   SECURITY_DESCRIPTOR;
     """
-    SECURITY_DESCRIPTOR_CONTROL = USHORT
+    SECURITY_DESCRIPTOR_CONTROL = ctypes.wintypes.USHORT
     REVISION = 1
 
     _fields_ = [
@@ -213,12 +298,17 @@ class SECURITY_ATTRIBUTES(ctypes.Structure):
         super(SECURITY_ATTRIBUTES, self).__init__(*args, **kwargs)
         self.nLength = ctypes.sizeof(SECURITY_ATTRIBUTES)
 
-    def _get_descriptor(self):
+    @property
+    def descriptor(self):
         return self._descriptor
-    def _set_descriptor(self, descriptor):
-        self._descriptor = descriptor
-        self.lpSecurityDescriptor = ctypes.addressof(descriptor)
-    descriptor = property(_get_descriptor, _set_descriptor)
+
+    @descriptor.setter
+    def descriptor(self, value):
+        self._descriptor = value
+        self.lpSecurityDescriptor = ctypes.addressof(value)
+
+#########################
+# jaraco.windows.security
 
 def GetTokenInformation(token, information_class):
     """
@@ -234,9 +324,6 @@ def GetTokenInformation(token, information_class):
         ctypes.byref(data_size)))
     return ctypes.cast(data, ctypes.POINTER(TOKEN_USER)).contents
 
-class TokenAccess:
-    TOKEN_QUERY = 0x8
-
 def OpenProcessToken(proc_handle, access):
     result = ctypes.wintypes.HANDLE()
     proc_handle = ctypes.wintypes.HANDLE(proc_handle)
diff --git a/paramiko/hostkeys.py b/paramiko/hostkeys.py
index cd65e77c..48ed7eec 100644
--- a/paramiko/hostkeys.py
+++ b/paramiko/hostkeys.py
@@ -92,7 +92,7 @@ class HostKeys (MutableMapping):
         :raises IOError: if there was an error reading the file
         """
         with open(filename, 'r') as f:
-            for lineno, line in enumerate(f):
+            for lineno, line in enumerate(f, 1):
                 line = line.strip()
                 if (len(line) == 0) or (line[0] == '#'):
                     continue
diff --git a/paramiko/py3compat.py b/paramiko/py3compat.py
index 57c096b2..6fafc31d 100644
--- a/paramiko/py3compat.py
+++ b/paramiko/py3compat.py
@@ -3,7 +3,7 @@ import base64
 
 __all__ = ['PY2', 'string_types', 'integer_types', 'text_type', 'bytes_types', 'bytes', 'long', 'input',
            'decodebytes', 'encodebytes', 'bytestring', 'byte_ord', 'byte_chr', 'byte_mask',
-           'b', 'u', 'b2s', 'StringIO', 'BytesIO', 'is_callable', 'MAXSIZE', 'next']
+           'b', 'u', 'b2s', 'StringIO', 'BytesIO', 'is_callable', 'MAXSIZE', 'next', 'builtins']
 
 PY2 = sys.version_info[0] < 3
 
@@ -18,6 +18,8 @@ if PY2:
     decodebytes = base64.decodestring
     encodebytes = base64.encodestring
 
+    import __builtin__ as builtins
+
 
     def bytestring(s):  # NOQA
         if isinstance(s, unicode):
@@ -102,6 +104,7 @@ if PY2:
 else:
     import collections
     import struct
+    import builtins
     string_types = str
     text_type = str
     bytes = bytes
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 7a140e38..c1705755 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,12 @@
 Changelog
 =========
 
+* :bug:`401` Fix line number reporting in log output regarding invalid
+  ``known_hosts`` line entries. Thanks to Dylan Thacker-Smith for catch &
+  patch.
+* :support:`525 backported` Update the vendored Windows API addon to a more
+  recent edition. Also fixes :issue:`193`, :issue:`488`, :issue:`498`. Thanks
+  to Jason Coombs.
 * :release:`1.14.3 <2015-11-02>`
 * :release:`1.13.4 <2015-11-02>`
 * :bug:`366` Fix `~paramiko.sftp_attributes.SFTPAttributes` so its string