diff --git a/ChangeLog b/ChangeLog index 2b8b66a..3816618 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2017-04-02 Ray Brown + + Release 1.2.0 Preparation + + * README.txt -> README.md: renamed + * dtls/sslconnection.py: Reduce the default MTU in effect while handshaking to 576, suitable for various path MTUs and PPPoE + * dtls/prebuilt/win32-x86[_64]: Rebuilt with Visual C++ 2008 to eliminate requirement to install a C++ redistributable package + * dtls/prebuilt/mingw-x86: mingw support is deprecated + * dtls/__init__.py: VERSION introduced + * setup.py: Version incremented to 1.2.0 + 2017-03-28 Björn Freise Workaround for Windows concerning the MTU size diff --git a/README.txt b/README.md similarity index 100% rename from README.txt rename to README.md diff --git a/dtls/__init__.py b/dtls/__init__.py index 49d4a01..651737d 100644 --- a/dtls/__init__.py +++ b/dtls/__init__.py @@ -32,6 +32,8 @@ sockets. wrap_socket's parameters and their semantics have been maintained. """ +VERSION = 1, 2, 0 + def _prep_bins(): """ Support for running straight out of a cloned source directory instead diff --git a/dtls/openssl.py b/dtls/openssl.py index ae5c3b5..53667a1 100644 --- a/dtls/openssl.py +++ b/dtls/openssl.py @@ -60,19 +60,10 @@ _logger = getLogger(__name__) # if sys.platform.startswith('win'): dll_path = path.abspath(path.dirname(__file__)) - debug_cryptodll_path = path.join(dll_path, "cygcrypto-1.0.0.dll") - debug_ssldll_path = path.join(dll_path, "cygssl-1.0.0.dll") - release_cryptodll_path = path.join(dll_path, "libeay32.dll") - release_ssldll_path = path.join(dll_path, "ssleay32.dll") - if path.exists(path.join(dll_path, "use_debug_openssl")) and \ - path.exists(debug_cryptodll_path) and \ - path.exists(debug_ssldll_path): - libcrypto = CDLL(debug_cryptodll_path) - libssl = CDLL(debug_ssldll_path) - else: - # If these don't exist, then let the exception propagate - libcrypto = CDLL(release_cryptodll_path) - libssl = CDLL(release_ssldll_path) + cryptodll_path = path.join(dll_path, "libeay32.dll") + ssldll_path = path.join(dll_path, "ssleay32.dll") + libcrypto = CDLL(cryptodll_path) + libssl = CDLL(ssldll_path) else: libcrypto = CDLL("libcrypto.so.1.0.0") libssl = CDLL("libssl.so.1.0.0") diff --git a/dtls/prebuilt/mingw-x86/cygcrypto-1.0.0.dll b/dtls/prebuilt/mingw-x86/cygcrypto-1.0.0.dll deleted file mode 100644 index 1b649e8..0000000 Binary files a/dtls/prebuilt/mingw-x86/cygcrypto-1.0.0.dll and /dev/null differ diff --git a/dtls/prebuilt/mingw-x86/cygssl-1.0.0.dll b/dtls/prebuilt/mingw-x86/cygssl-1.0.0.dll deleted file mode 100644 index 45815bd..0000000 Binary files a/dtls/prebuilt/mingw-x86/cygssl-1.0.0.dll and /dev/null differ diff --git a/dtls/prebuilt/mingw-x86/libeay32.dll b/dtls/prebuilt/mingw-x86/libeay32.dll deleted file mode 100644 index d0306d5..0000000 Binary files a/dtls/prebuilt/mingw-x86/libeay32.dll and /dev/null differ diff --git a/dtls/prebuilt/mingw-x86/manifest.pycfg b/dtls/prebuilt/mingw-x86/manifest.pycfg deleted file mode 100644 index 2b16159..0000000 --- a/dtls/prebuilt/mingw-x86/manifest.pycfg +++ /dev/null @@ -1,33 +0,0 @@ -# Prebuilt directory manifest. - -# Copyright 2012 Ray Brown -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# The License is also distributed with this work in the file named "LICENSE." -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This file is executed by the distribution builder, as well as the dtls -# package startup code; the purpose of the latter is being able to run -# from a cloned source directory without executing any sort of installation -# procedure. This file provides the definitions required to create -# a distribution including this directory's prebuilts. - -from os import path -from glob import glob - -assert MANIFEST_DIR - -ARCHITECTURE = "mingw-win32" -FORMATS = "gztar" -FILES = map(lambda x: path.basename(x), - glob(path.join(MANIFEST_DIR, "*.dll"))) diff --git a/dtls/prebuilt/mingw-x86/ssleay32.dll b/dtls/prebuilt/mingw-x86/ssleay32.dll deleted file mode 100644 index a61548e..0000000 Binary files a/dtls/prebuilt/mingw-x86/ssleay32.dll and /dev/null differ diff --git a/dtls/prebuilt/win32-x86/libeay32.dll b/dtls/prebuilt/win32-x86/libeay32.dll index 2790b8c..df0a5cb 100644 Binary files a/dtls/prebuilt/win32-x86/libeay32.dll and b/dtls/prebuilt/win32-x86/libeay32.dll differ diff --git a/dtls/prebuilt/win32-x86/ssleay32.dll b/dtls/prebuilt/win32-x86/ssleay32.dll index 129a31b..175bb06 100644 Binary files a/dtls/prebuilt/win32-x86/ssleay32.dll and b/dtls/prebuilt/win32-x86/ssleay32.dll differ diff --git a/dtls/prebuilt/win32-x86_64/libeay32.dll b/dtls/prebuilt/win32-x86_64/libeay32.dll index 4c99c93..57aea15 100644 Binary files a/dtls/prebuilt/win32-x86_64/libeay32.dll and b/dtls/prebuilt/win32-x86_64/libeay32.dll differ diff --git a/dtls/prebuilt/win32-x86_64/ssleay32.dll b/dtls/prebuilt/win32-x86_64/ssleay32.dll index 8f1eb45..2759d6c 100644 Binary files a/dtls/prebuilt/win32-x86_64/ssleay32.dll and b/dtls/prebuilt/win32-x86_64/ssleay32.dll differ diff --git a/dtls/sslconnection.py b/dtls/sslconnection.py index 7589ffc..5b69b06 100644 --- a/dtls/sslconnection.py +++ b/dtls/sslconnection.py @@ -562,9 +562,10 @@ class SSLConnection(object): if self._user_config_ssl: self._user_config_ssl(self._intf_ssl) - if sys.platform.startswith('win') and not (SSL_get_options(self._ssl.value) & SSL_OP_NO_QUERY_MTU): + if sys.platform.startswith('win') and \ + not (SSL_get_options(self._ssl.value) & SSL_OP_NO_QUERY_MTU): SSL_set_options(self._ssl.value, SSL_OP_NO_QUERY_MTU) - DTLS_set_link_mtu(self._ssl.value, 1500) + DTLS_set_link_mtu(self._ssl.value, 576) SSL_set_bio(self._ssl.value, self._rbio.value, self._wbio.value) self._rbio.disown() diff --git a/setup.py b/setup.py index 62302aa..a2fcc52 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ for scheme in INSTALL_SCHEMES.values(): scheme['data'] = scheme['purelib'] NAME = "Dtls" -VERSION = "1.0.2" +VERSION = "1.2.0" DIST_DIR = "dist" FORMAT_TO_SUFFIX = { "zip": ".zip",