From 00b6b2e28dda538e5079fb045a27ff2a45117c71 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 8 Feb 2020 03:49:53 +0800 Subject: [PATCH] packages: sync with upstream source --- .../luasrc/controller/filebrowser.lua | 2 +- .../luasrc/controller/softethervpn5.lua | 14 +- package/lean/UnblockNeteaseMusic/Makefile | 4 +- .../Makefile | 16 +- package/lean/luci-app-qbittorrent/Makefile | 9 +- .../luasrc/controller/qbittorrent.lua | 2 +- .../luasrc/model/cbi/qbittorrent.lua | 377 +- .../po/zh_Hans/qbittorrent.po | 615 +-- .../root/etc/config/qbittorrent | 23 +- .../root/etc/init.d/qbittorrent | 304 +- .../root/etc/uci-defaults/luci-qbittorrent | 21 - .../root/etc/uci-defaults/qbittorrent | 12 + .../Makefile | 30 +- .../files/ipfilter.dat | 293 ++ .../001-remove-ico-not-for-webui.patch | 126 - .../patches/002-add-autoban-function.patch | 807 ---- package/lean/qt5/Makefile | 102 +- ...resolving-for-OPENSSL_NO_NEXPROTONEG.patch | 19 + .../qt5/patches/010-pre_3.6_kernels_fix.patch | 74 - .../qt5/patches/020-disable_unused_libs.patch | 91 - ...qtbase-fix-compile-with-openssl1.1.1.patch | 3985 ----------------- 21 files changed, 533 insertions(+), 6393 deletions(-) rename package/lean/{rblibtorrent => libtorrent-rasterbar}/Makefile (84%) delete mode 100644 package/lean/luci-app-qbittorrent/root/etc/uci-defaults/luci-qbittorrent create mode 100755 package/lean/luci-app-qbittorrent/root/etc/uci-defaults/qbittorrent rename package/lean/{qBittorrent => qBittorrent-Enhanced-Edition}/Makefile (58%) create mode 100644 package/lean/qBittorrent-Enhanced-Edition/files/ipfilter.dat delete mode 100644 package/lean/qBittorrent/patches/001-remove-ico-not-for-webui.patch delete mode 100644 package/lean/qBittorrent/patches/002-add-autoban-function.patch create mode 100644 package/lean/qt5/patches/001-fix-symbol-resolving-for-OPENSSL_NO_NEXPROTONEG.patch delete mode 100644 package/lean/qt5/patches/010-pre_3.6_kernels_fix.patch delete mode 100644 package/lean/qt5/patches/020-disable_unused_libs.patch delete mode 100644 package/lean/qt5/patches/030-qtbase-fix-compile-with-openssl1.1.1.patch diff --git a/package/ctcgfw/luci-app-filebrowser/luasrc/controller/filebrowser.lua b/package/ctcgfw/luci-app-filebrowser/luasrc/controller/filebrowser.lua index 12b2396fbd..1d82f03d5e 100644 --- a/package/ctcgfw/luci-app-filebrowser/luasrc/controller/filebrowser.lua +++ b/package/ctcgfw/luci-app-filebrowser/luasrc/controller/filebrowser.lua @@ -5,6 +5,6 @@ function index() return end local page - page = entry({"admin", "services", "filebrowser"}, cbi("filebrowser"), _("文件管理器"), 100) + page = entry({"admin", "nas", "filebrowser"}, cbi("filebrowser"), _("文件管理器"), 100) page.dependent = true end diff --git a/package/jsda/luci-app-softethervpn5/luasrc/controller/softethervpn5.lua b/package/jsda/luci-app-softethervpn5/luasrc/controller/softethervpn5.lua index ea1dc33109..2733deff35 100644 --- a/package/jsda/luci-app-softethervpn5/luasrc/controller/softethervpn5.lua +++ b/package/jsda/luci-app-softethervpn5/luasrc/controller/softethervpn5.lua @@ -7,11 +7,11 @@ function index() return end - entry({"admin", "services", "softethervpn5"},alias("admin", "services", "softethervpn5", "setting"),_("softethervpn5"), 10).dependent = true - entry({"admin", "services", "softethervpn5", "setting"},arcombine(cbi("softethervpn5/setting"), form("softethervpn5/setting-config")),_("VPN Setting"), 10).leaf = true + entry({"admin", "vpn", "softethervpn5"},alias("admin", "vpn", "softethervpn5", "setting"),_("SoftEther VPN5"), 10).dependent = true + entry({"admin", "vpn", "softethervpn5", "setting"},arcombine(cbi("softethervpn5/setting"), form("softethervpn5/setting-config")),_("VPN Setting"), 10).leaf = true - entry({"admin", "services", "softethervpn5", "server"},form("softethervpn5/server"),_("VPN Server"), 20).leaf = true - entry({"admin", "services", "softethervpn5", "bridge"},form("softethervpn5/bridge"),_("VPN Bridge"), 30).leaf = true - entry({"admin", "services", "softethervpn5", "client"},form("softethervpn5/client"),_("VPN Client"), 40).leaf = true - entry({"admin", "services", "softethervpn5", "status"},form("softethervpn5/status"),_("Status"), 50).leaf = true -end \ No newline at end of file + entry({"admin", "vpn", "softethervpn5", "server"},form("softethervpn5/server"),_("VPN Server"), 20).leaf = true + entry({"admin", "vpn", "softethervpn5", "bridge"},form("softethervpn5/bridge"),_("VPN Bridge"), 30).leaf = true + entry({"admin", "vpn", "softethervpn5", "client"},form("softethervpn5/client"),_("VPN Client"), 40).leaf = true + entry({"admin", "vpn", "softethervpn5", "status"},form("softethervpn5/status"),_("Status"), 50).leaf = true +end diff --git a/package/lean/UnblockNeteaseMusic/Makefile b/package/lean/UnblockNeteaseMusic/Makefile index 639e9a1968..797c5c0551 100644 --- a/package/lean/UnblockNeteaseMusic/Makefile +++ b/package/lean/UnblockNeteaseMusic/Makefile @@ -11,14 +11,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=UnblockNeteaseMusic -PKG_VERSION:=0.22.3 +PKG_VERSION:=2020.02.05 PKG_RELEASE:=1 PKG_LICENSE:=MIT PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/nondanee/UnblockNeteaseMusic.git -PKG_SOURCE_VERSION:=ee9d883b968b78842ab626f4f8051b40d4e7ff47 +PKG_SOURCE_VERSION:=98809174c3de3266a930e3af74df630075823304 PKG_SOURCE_SUBDIR:=$(PKG_NAME) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz diff --git a/package/lean/rblibtorrent/Makefile b/package/lean/libtorrent-rasterbar/Makefile similarity index 84% rename from package/lean/rblibtorrent/Makefile rename to package/lean/libtorrent-rasterbar/Makefile index d2709c7bb5..5b6ac668f9 100644 --- a/package/lean/rblibtorrent/Makefile +++ b/package/lean/libtorrent-rasterbar/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=rblibtorrent -PKG_VERSION:=1.1.13 +PKG_NAME:=libtorrent-rasterbar +PKG_VERSION:=1.2.3 PKG_RELEASE=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/arvidn/libtorrent.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=6f1250c6535730897909240ea0f4f2a81937d21a +PKG_SOURCE_VERSION:=078f7b956ef0d992948852a801e626b1118a1fc5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_LICENSE:=BSD @@ -19,16 +19,16 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -define Package/rblibtorrent +define Package/libtorrent-rasterbar SECTION:=libs CATEGORY:=Libraries TITLE:=Rasterbar BitTorrent library URL:=https://www.libtorrent.org/ - DEPENDS:=+libstdcpp +libopenssl +boost +boost-system +boost-chrono +boost-random + DEPENDS:=+libstdcpp +libopenssl +boost +boost-system +boost-chrono +boost-random $(ICONV_DEPENDS) MAINTAINER:=Arvid Norberg endef -define Package/rblibtorrent/description +define Package/libtorrent-rasterbar/description Rasterbar libtorrent is a C++ library that aims to be a good alternative to all the other bittorrent implementations around. It is a library and not a full featured client, although it comes with a working example client. @@ -66,9 +66,9 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtorrent-rasterbar.pc $(1)/usr/lib/pkgconfig/ endef -define Package/rblibtorrent/install +define Package/libtorrent-rasterbar/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent-rasterbar.so.* $(1)/usr/lib/ endef -$(eval $(call BuildPackage,rblibtorrent)) +$(eval $(call BuildPackage,libtorrent-rasterbar)) diff --git a/package/lean/luci-app-qbittorrent/Makefile b/package/lean/luci-app-qbittorrent/Makefile index 343d888466..3386cdf35a 100644 --- a/package/lean/luci-app-qbittorrent/Makefile +++ b/package/lean/luci-app-qbittorrent/Makefile @@ -1,15 +1,16 @@ # Copyright (C) 2019 Openwrt.org # -# This is free software, licensed under the Apache License, Version 2.0 . +# This is a free software, use it under Apache Licene 2.0 & GNU General Public License v3.0. # include $(TOPDIR)/rules.mk -LUCI_TITLE:=LuCI support for qBittorrent -LUCI_DEPENDS:=+qBittorrent +python +LUCI_TITLE:=qbittorrent-nox for LuCI +LUCI_DEPENDS:=+qBittorrent-Enhanced-Edition LUCI_PKGARCH:=all +PKG_NAME:=luci-app-qbittorrent PKG_VERSION=1.0 -PKG_RELEASE:=18 +PKG_RELEASE:=2 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-qbittorrent/luasrc/controller/qbittorrent.lua b/package/lean/luci-app-qbittorrent/luasrc/controller/qbittorrent.lua index 77d58b971c..11d169c6c6 100644 --- a/package/lean/luci-app-qbittorrent/luasrc/controller/qbittorrent.lua +++ b/package/lean/luci-app-qbittorrent/luasrc/controller/qbittorrent.lua @@ -13,4 +13,4 @@ function act_status() e.running=luci.sys.call("pgrep qbittorrent-nox >/dev/null")==0 luci.http.prepare_content("application/json") luci.http.write_json(e) -end \ No newline at end of file +end diff --git a/package/lean/luci-app-qbittorrent/luasrc/model/cbi/qbittorrent.lua b/package/lean/luci-app-qbittorrent/luasrc/model/cbi/qbittorrent.lua index 7431394f24..f764ff79db 100644 --- a/package/lean/luci-app-qbittorrent/luasrc/model/cbi/qbittorrent.lua +++ b/package/lean/luci-app-qbittorrent/luasrc/model/cbi/qbittorrent.lua @@ -1,371 +1,36 @@ - -local o=luci.sys.exec("uci get qbittorrent.main.Port | xargs echo -n") or 8080 +local e=require"luci.model.uci".cursor() +local o=e:get_first("qbittorrent","qbittorrent","port") or 8080 local a=(luci.sys.call("pidof qbittorrent-nox > /dev/null")==0) local t="" if a then -t="

" + t="

" end -function titlesplit(Value) - return "

" .. translate(Value) .. "

" -end +m = Map("qbittorrent", translate("qBittorrent"), translate("qBittorrent is a cross-platform free and open-source BitTorrent client.").."
"..translate("Default login username: admin, password: adminadmin.")..t) -m = Map("qbittorrent", translate("qBittorrent"), translate("qBittorrent is a cross-platform free and open-source BitTorrent client")..t) +m:section(SimpleSection).template="qbittorrent/qbittorrent_status" -s = m:section(NamedSection, "main", "qbittorrent") +s = m:section(TypedSection, "qbittorrent") +s.anonymous=true -s:tab("basic", translate("Basic Settings")) +enable = s:option(Flag, "enable", translate("Enable")) +enable.rmempty = false -o = s:taboption("basic", Flag, "enabled", translate("Enabled")) -o.default = "1" +port = s:option(Value,"port",translate("Port"),translate("WebUI listening port")) +port.default = "8080" +port.placeholder = "8080" +port.rmempty = false -o = s:taboption("basic", ListValue, "user", translate("Run daemon as user")) -local u -for u in luci.util.execi("cat /etc/passwd | cut -d ':' -f1") do - o:value(u) -end +profile_dir = s:option(Value,"profile_dir",translate("Profile Dir"),translate("Store configuration files in the Path")) +profile_dir.default = "/etc" +profile_dir.placeholder = "/etc" +profile_dir.rmempty = false -o = s:taboption("basic", Value, "profile", translate("Store configuration files in the Path")) -o.default = '/tmp' - -o = s:taboption("basic", Value, "SavePath", translate("Store download files in the Path")) -o.placeholder = "/tmp/download" - -o = s:taboption("basic", Value, "Port", translate("WEBUI listening port")) -o.datatype = "port" -o.placeholder = "8080" - -o = s:taboption("basic", Flag, "UseRandomPort", translate("Use Random Port"), translate("Randomly assigns a different port every time qBittorrent starts up")) -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - -o = s:taboption("basic", Value, "PortRangeMin", translate("Connection Port"), translate("Incoming connection port")) -o:depends("UseRandomPort", false) -o.datatype = "range(1024,65535)" - - -s:tab("connection", translate("Connection Settings")) - -o = s:taboption("connection", Flag, "UPnP", translate("Use UPnP for Connections"), translate("Use UPnP/ NAT-PMP port forwarding from my router. Refer to the " - .. "wiki.")) -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - - -o = s:taboption("connection", Value, "GlobalDLLimit", translate("Global Download Speed"), translate("Global Download Speed Limit(KiB/s).")) -o.datatype = "float" -o.placeholder = "0" - -o = s:taboption("connection", Value, "GlobalUPLimit", translate("Global Upload Speed"), translate("Global Upload Speed Limit(KiB/s).")) -o.datatype = "float" -o.placeholder = "0" - -o = s:taboption("connection", Value, "GlobalDLLimitAlt", translate("Alternative Download Speed"), translate("Alternative Download Speed Limit(KiB/s).")) -o.datatype = "float" -o.placeholder = "10" - -o = s:taboption("connection", Value, "GlobalUPLimitAlt", translate("Alternative Upload Speed"), translate("Alternative Upload Speed Limit(KiB/s).")) -o.datatype = "float" -o.placeholder = "10" - -o = s:taboption("connection", ListValue, "BTProtocol", translate("Enabled protocol"), translate("The protocol that was enabled.")) -o:value("Both", translate("TCP and UTP")) -o:value("TCP", translate("TCP")) -o:value("UTP", translate("UTP")) -o.default = "Both" - -o = s:taboption("connection", Value, "InetAddress", translate("Inet Address"), translate("The address that respond to the trackers.")) - -s:tab("downloads", translate("Download Settings")) - -o = s:taboption("downloads", Flag, "CreateTorrentSubfolder", translate("Create Subfolder"), translate("Create subfolder for torrents with multiple files.")) -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - -o = s:taboption("downloads", Flag, "StartInPause", translate("Start In Pause"), translate("Do not start the download automatically.")) -o.enabled = "true" -o.disabled = "false" -o.default = o.disabled - -o = s:taboption("downloads", Flag, "AutoDeleteAddedTorrentFile", translate("Auto Delete Torrent File"), translate("The .torrent files will be deleted afterwards.")) -o.enabled = "IfAdded" -o.disabled = "Never" -o.default = o.disabled - -o = s:taboption("downloads", Flag, "PreAllocation", translate("Pre Allocation"), translate("Pre-allocate disk space for all files.")) -o.enabled = "true" -o.disabled = "false" -o.default = o.disabled - -o = s:taboption("downloads", Flag, "UseIncompleteExtension", translate("Use Incomplete Extension"), translate("The incomplete task will be added the extension of !qB.")) -o.enabled = "true" -o.disabled = "false" -o.default = o.disabled - -o = s:taboption("downloads", Flag, "TempPathEnabled", translate("Temp Path Enabled")) -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - -o = s:taboption("downloads", Value, "TempPath", translate("Temp Path"), translate("The absolute and relative path can be set.")) -o:depends("TempPathEnabled", "true") -o.placeholder = "temp/" - -o = s:taboption("downloads", Value, "DiskWriteCacheSize", translate("Disk Cache Size (MiB)"), translate("The value -1 is auto and 0 is disable. In default, it is set to 64MiB.")) -o.datatype = "integer" -o.placeholder = "64" - -o = s:taboption("downloads", Value, "DiskWriteCacheTTL", translate("Disk Cache TTL (s)"), translate("In default, it is set to 60s.")) -o.datatype = "integer" -o.placeholder = "60" - -o = s:taboption("downloads", DummyValue, "Saving Management", titlesplit("Saving Management")) - -o = s:taboption("downloads", ListValue, "DisableAutoTMMByDefault", translate("Default Torrent Management Mode")) -o:value("true", translate("Manual")) -o:value("false", translate("Automaic")) -o.default = "true" - -o = s:taboption("downloads", ListValue, "CategoryChanged", translate("Torrent Category Changed"), translate("Choose the action when torrent category changed.")) -o:value("true", translate("Switch torrent to Manual Mode")) -o:value("false", translate("Relocate torrent")) -o.default = "false" - -o = s:taboption("downloads", ListValue, "DefaultSavePathChanged", translate("Default Save Path Changed"), translate("Choose the action when default save path changed.")) -o:value("true", translate("Switch affected torrent to Manual Mode")) -o:value("false", translate("Relocate affected torrent")) -o.default = "true" - -o = s:taboption("downloads", ListValue, "CategorySavePathChanged", translate("Category Save Path Changed"), translate("Choose the action when category save path changed.")) -o:value("true", translate("Switch affected torrent to Manual Mode")) -o:value("false", translate("Relocate affected torrent")) -o.default = "true" - -o = s:taboption("downloads", Value, "TorrentExportDir", translate("Torrent Export Dir"), translate("The .torrent files will be copied to the target directory.")) - -o = s:taboption("downloads", Value, "FinishedTorrentExportDir", translate("Finished Torrent Export Dir"), translate("The .torrent files for finished downloads will be copied to the target directory.")) - -s:tab("bittorrent", translate("Bittorrent Settings")) - -o = s:taboption("bittorrent", Flag, "DHT", translate("Enable DHT"), translate("Enable DHT (decentralized network) to find more peers")) -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - -o = s:taboption("bittorrent", Flag, "PeX", translate("Enable PeX"), translate("Enable Peer Exchange (PeX) to find more peers")) -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - -o = s:taboption("bittorrent", Flag, "LSD", translate("Enable LSD"), translate("Enable Local Peer Discovery to find more peers")) -o.enabled = "true" -o.disabled = "false" -o.default = o.disabled - -o = s:taboption("bittorrent", Flag, "uTP_rate_limited", translate("uTP Rate Limit"), translate("Apply rate limit to μTP protocol.")) -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - -o = s:taboption("bittorrent", ListValue, "Encryption", translate("Encryption Mode"), translate("Enable DHT (decentralized network) to find more peers")) -o:value("0", translate("Prefer Encryption")) -o:value("1", translate("Require Encryption")) -o:value("2", translate("Disable Encryption")) -o.default = "0" - -o = s:taboption("bittorrent", Value, "MaxConnecs", translate("Max Connections"), translate("The max number of connections.")) -o.datatype = "integer" -o.placeholder = "500" - -o = s:taboption("bittorrent", Value, "MaxConnecsPerTorrent", translate("Max Connections Per Torrent"), translate("The max number of connections per torrent.")) -o.datatype = "integer" -o.placeholder = "100" - -o = s:taboption("bittorrent", Value, "MaxUploads", translate("Max Uploads"), translate("The max number of connected peers.")) -o.datatype = "integer" -o.placeholder = "8" - -o = s:taboption("bittorrent", Value, "MaxUploadsPerTorrent", translate("Max Uploads Per Torrent"), translate("The max number of connected peers per torrent.")) -o.datatype = "integer" -o.placeholder = "4" - -o = s:taboption("bittorrent", Value, "MaxRatio", translate("Max Ratio"), translate("The max ratio for seeding. -1 is to disable the seeding.")) -o.datatype = "float" -o.placeholder = "-1" - -o = s:taboption("bittorrent", ListValue, "MaxRatioAction", translate("Max Ratio Action"), translate("The action when reach the max seeding ratio.")) -o:value("0", translate("Pause them")) -o:value("1", translate("Remove them")) -o.defaule = "0" - -o = s:taboption("bittorrent", Value, "GlobalMaxSeedingMinutes", translate("Max Seeding Minutes"), translate("Units: minutes")) -o.datatype = "integer" - -o = s:taboption("bittorrent", DummyValue, "Queueing Setting", titlesplit("Queueing Setting")) - -o = s:taboption("bittorrent", Flag, "QueueingEnabled", translate("Enable Torrent Queueing")) -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - -o = s:taboption("bittorrent", Value, "MaxActiveDownloads", translate("Maximum Active Downloads")) -o.datatype = "integer" -o.placeholder = "3" - -o = s:taboption("bittorrent", Value, "MaxActiveUploads", translate("Max Active Uploads")) -o.datatype = "integer" -o.placeholder = "3" - -o = s:taboption("bittorrent", Value, "MaxActiveTorrents", translate("Max Active Torrents")) -o.datatype = "integer" -o.placeholder = "5" - -o = s:taboption("bittorrent", Flag, "IgnoreSlowTorrents", translate("Ignore Slow Torrents"), translate("Do not count slow torrents in these limits.")) -o.enabled = "true" -o.disabled = "false" -o.default = o.disabled - -o = s:taboption("bittorrent", Value, "SlowTorrentsDownloadRate", translate("Download rate threshold"), translate("Units: KiB/s")) -o.datatype = "integer" -o.placeholder = "2" - -o = s:taboption("bittorrent", Value, "SlowTorrentsUploadRate", translate("Upload rate threshold"), translate("Units: KiB/s")) -o.datatype = "integer" -o.placeholder = "2" - -o = s:taboption("bittorrent", Value, "SlowTorrentsInactivityTimer", translate("Torrent inactivity timer"), translate("Units: seconds")) -o.datatype = "integer" -o.placeholder = "60" - -s:tab("webgui", translate("WebUI Settings")) - -o = s:taboption("webgui", Flag, "UseUPnP", translate("Use UPnP for WebUI"), translate("Using the UPnP / NAT-PMP port of the router for connecting to WebUI.")) -o.enabled = "true" -o.disabled = "false" -o.default = o.disabled - -o = s:taboption("webgui", Value, "Username", translate("Username"), translate("The login name for WebUI.")) -o.placeholder = "admin" - -o = s:taboption("webgui", Value, "Password", translate("Password"), translate("The login password for WebUI.")) -o.password = true - -o = s:taboption("webgui", Value, "Locale", translate("Locale Language")) -o:value("en", translate("English")) -o:value("zh", translate("Chinese")) -o.default = "en" - -o = s:taboption("webgui", Flag, "CSRFProtection", translate("CSRF Protection"), translate("Enable Cross-Site Request Forgery (CSRF) protection.")) -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - -o = s:taboption("webgui", Flag, "ClickjackingProtection", translate("Clickjacking Protection"), translate("Enable clickjacking protection.")) -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - -o = s:taboption("webgui", Flag, "HostHeaderValidation", translate("Host Header Validation"), translate("Validate the host header.")) -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - -o = s:taboption("webgui", Flag, "LocalHostAuth", translate("Local Host Authentication"), translate("Force authentication for clients on localhost.")) -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - -o = s:taboption("webgui", Flag, "AuthSubnetWhitelistEnabled", translate("Enable Subnet Whitelist")) -o.enabled = "true" -o.disabled = "false" -o.default = o.disabled - -o = s:taboption("webgui", DynamicList, "AuthSubnetWhitelist", translate("Subnet Whitelist")) -o:depends("AuthSubnetWhitelistEnabled", "true") - -s:tab("advanced", translate("Advance Settings")) - -o = s:taboption("advanced", Flag, "AnonymousMode", translate("Anonymous Mode"), translate("When enabled, qBittorrent will take certain measures to try" - .. " to mask its identity. Refer to the wiki")) -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - -o = s:taboption("advanced", Flag, "SuperSeeding", translate("Super Seeding"), translate("The super seeding mode.")) -o.enabled = "true" -o.disabled = "false" -o.default = o.disabled - -o = s:taboption("advanced", Value, "configuration", translate("Profile Folder Suffix"), translate("Suffix for profile folder")) - -o = s:taboption("advanced", Flag, "IncludeOverhead", translate("Limit Overhead Usage"), translate("The overhead usage is been limitted.")) -o.enabled = "true" -o.disabled = "false" -o.default = o.disabled - -o = s:taboption("advanced", Flag, "IgnoreLimitsLAN", translate("Ignore LAN Limit"), translate("Ignore the speed limit to LAN.")) -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - -o = s:taboption("advanced", Flag, "osCache", translate("Use os Cache")) -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - -o = s:taboption("advanced", Value, "OutgoingPortsMax", translate("Max Outgoing Port"), translate("The max outgoing port.")) -o.datatype = "port" - -o = s:taboption("advanced", Value, "OutgoingPortsMin", translate("Min Outgoing Port"), translate("The min outgoing port.")) -o.datatype = "port" - -o = s:taboption("advanced", ListValue, "SeedChokingAlgorithm", translate("Choking Algorithm"), translate("The strategy of choking algorithm.")) -o:value("RoundRobin", translate("Round Robin")) -o:value("FastestUpload", translate("Fastest Upload")) -o:value("AntiLeech", translate("Anti-Leech")) -o.default = "FastestUpload" - -o = s:taboption("advanced", Flag, "AnnounceToAllTrackers", translate("Announce To All Trackers")) -o.enabled = "true" -o.disabled = "false" -o.default = o.disabled - -o = s:taboption("advanced", Flag, "AnnounceToAllTiers", translate("Announce To All Tiers")) -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - -o = s:taboption("advanced", Flag, "Enabled", translate("Enable Log"), translate("Enable logger to log file.")) -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - -o = s:taboption("advanced", Value, "Path", translate("Log Path"), translate("The path for qbittorrent log.")) -o:depends("Enabled", "true") - -o = s:taboption("advanced", Flag, "Backup", translate("Enable Backup"), translate("Backup log file when oversize the given size.")) -o:depends("Enabled", "true") -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - -o = s:taboption("advanced", Flag, "DeleteOld", translate("Delete Old Backup"), translate("Delete the old log file.")) -o:depends("Enabled", "true") -o.enabled = "true" -o.disabled = "false" -o.default = o.enabled - -o = s:taboption("advanced", Value, "MaxSizeBytes", translate("Log Max Size"), translate("The max size for qbittorrent log (Unit: Bytes).")) -o:depends("Enabled", "true") -o.placeholder = "66560" - -o = s:taboption("advanced", Value, "SaveTime", translate("Log Saving Period"), translate("The log file will be deteted after given time. 1d -- 1 day, 1m -- 1 month, 1y -- 1 year")) -o:depends("Enabled", "true") -o.datatype = "string" +download_dir = s:option(Value,"download_dir",translate("Download Dir"),translate("Store download files in the Path")) +download_dir.default = "/mnt/download" +download_dir.placeholder = "/mnt/download" +download_dir.rmempty = false return m diff --git a/package/lean/luci-app-qbittorrent/po/zh_Hans/qbittorrent.po b/package/lean/luci-app-qbittorrent/po/zh_Hans/qbittorrent.po index 001a33f599..dc4e57db0f 100644 --- a/package/lean/luci-app-qbittorrent/po/zh_Hans/qbittorrent.po +++ b/package/lean/luci-app-qbittorrent/po/zh_Hans/qbittorrent.po @@ -1,574 +1,41 @@ -msgid "qbittorrent" -msgstr "qbittorrent" - -msgid "Running" -msgstr "运行中" - -msgid "Not running" -msgstr "未运行" - -msgid "qbittorrent Run Status" -msgstr "qbittorrent运行状态" - -msgid "Basic Settings" -msgstr "基本设置" - -msgid "Enable" -msgstr "启用" - -msgid "qBittorrent is a cross-platform free and open-source BitTorrent client" -msgstr "qBittorrent是一个基于 QT 的跨平台的开源 BitTorrent 客户端" - -msgid "profile_dir" -msgstr "配置文件目录" - -msgid "Store configuration files in the Path" -msgstr "配置文件存放路径" - -msgid "program_dir" -msgstr "程序目录" - -msgid "library_dir" -msgstr "库目录" - -msgid "Store Program files in the Path" -msgstr "程序文件存放路径" - -msgid "Store Library in the Path" -msgstr "库文件存放路径" - -msgid "Download Settings" -msgstr "下载设置" - -msgid "download_dir" -msgstr "下载目录" - -msgid "Store download files in the Path" -msgstr "下载文件存放目录" - -msgid "WEBUI Settings" -msgstr "WEBUI设置" - -msgid "WEBUI listening port" -msgstr "WebUI 监听端口" - -msgid "Use Random Port" -msgstr "随机传入连接端口" - -msgid "Randomly assigns a different port every time qBittorrent starts up" -msgstr "在每次启动时使用不同的传入连接端口" - -msgid "Connection Port" -msgstr "用于传入连接的端口" - -msgid "Incoming connection port" -msgstr "推荐在防火墙 -> 流量规则 中，打开这个端口获得更好的下载速度（ TCP+UDP ）" - -msgid "Bittorrent Settings" -msgstr "Bittorrent 设置" - -msgid "WebUI Settings" -msgstr "WebUI 设置" - -msgid "Advance Settings" -msgstr "高级设置" - - -msgid "Run daemon as user" -msgstr "用户组" - -msgid "Parent Path for Profile Folder" -msgstr "配置保存路径" - -msgid "The path for storing profile folder using by command: --profile [PATH]." -msgstr "配置文件的保存路径，默认的配置文件夹在/tmp下。例如：/etc/config" - -msgid "Profile Folder Suffix" -msgstr "配置目录后缀" - -msgid "Suffix for profile folder, for example, qBittorrent_[NAME]." -msgstr "配置文件文件夹的后缀。例如： qBittorrent_[NAME]" - -msgid "Locale Language" -msgstr "WebUI语言" - -msgid "English" -msgstr "英文" - -msgid "Chinese" -msgstr "中文" - -msgid "Enable Log" -msgstr "启用日志" - -msgid "Enable logger to log file." -msgstr "qBittorrent的启动和运行信息文档。" - -msgid "Log Path" -msgstr "日志文件" - -msgid "The path for qbittorrent log." -msgstr "日志文件自定义保存路径，默认都在配置文件夹的data下。" - -msgid "Enable Backup" -msgstr "启用备份" - -msgid "Backup log file when oversize the given size." -msgstr "备份日志文件。" - -msgid "Delete Old Backup" -msgstr "删除备份" - -msgid "Delete the old log file." -msgstr "符合下列设定后将删除旧的日志文件。" - -msgid "Log Max Size" -msgstr "日志保存大小" - -msgid "Log Saving Period" -msgstr "日志保存期限" - -msgid "The max size for qbittorrent log (Unit: Bytes)." -msgstr "设定日志文件的大小（单位：字节）" - -msgid "The log file will be deteted after given time. 1d -- 1 day, 1m -- 1 month, 1y -- 1 year" -msgstr "设定日志文件的时间（1d-1天,1m-1个月,1y-1年）" - -msgid "Connection Settings" -msgstr "连接设置" - -msgid "Use UPnP for Connections" -msgstr "端口自动转发" - -msgid "Use UPnP/ NAT-PMP port forwarding from my router." -msgstr "使用路由器的UPnP/NAT-PMP端口自动转发。" - -msgid "Use Random Port" -msgstr "启用随机端口" - -msgid "Use different port on each startup voids the first" -msgstr "在每次启动时使用随机的端口。" - -msgid "Connection Port" -msgstr "自定义端口" - -msgid "Generate Randomly" -msgstr "默认端口：8999" - -msgid "Global Download Speed" -msgstr "全局下载速度限制" - -msgid "Global Download Speed Limit(KiB/s)." -msgstr "全局下载速度限制(KiB/s)，0为无限制。" - -msgid "Global Upload Speed" -msgstr "全局上传速度限制" - -msgid "Alternative Download Speed" -msgstr "备用下载速度限制" - -msgid "Alternative Upload Speed" -msgstr "备用上传速度限制" - -msgid "Global Upload Speed Limit(KiB/s)." -msgstr "全局上传速度限制(KiB/s)，0为无限制。" - -msgid "Alternative Download Speed Limit(KiB/s)." -msgstr "备用下载速度限制(KiB/s)，0为无限制。" - -msgid "Alternative Upload Speed Limit(KiB/s)." -msgstr "备用上传速度限制(KiB/s)，0为无限制。" - -msgid "Enabled protocol" -msgstr "启用的协议" - -msgid "The protocol that was enabled." -msgstr "当前已启用的协议。" - -msgid "TCP and UTP" -msgstr "TCP和UTP" - -msgid "Inet Address" -msgstr "输入地址" - -msgid "The address that respond to the trackers." -msgstr "响应跟踪器的地址。" - -msgid "When adding seeds" -msgstr "当添加种子时" - -msgid "Downloads Settings" -msgstr "下载设置" - -msgid "Create Subfolder" -msgstr "创建目录" - -msgid "Create subfolder for torrents with multiple files." -msgstr "为含多个文件的种子创建子文件夹。" - -msgid "Start In Pause" -msgstr "开始暂停" - -msgid "Do not start the download automatically." -msgstr "在下载任务添加后暂停。" - -msgid "Auto Delete Torrent File" -msgstr "删除种子" - -msgid "The .torrent files will be deleted afterwards." -msgstr "下载完成后自动删除这个种子文件。" - -msgid "Pre Allocation" -msgstr "磁盘预分配" - -msgid "Pre-allocate disk space for all files." -msgstr "为刚添加的文件预先分配磁盘空间。" - -msgid "Use Incomplete Extension" -msgstr "使用扩展名" - -msgid "The incomplete task will be added the extension of !qB." -msgstr "为不完整的文件添加后缀名!qB" - -msgid "Save Path" -msgstr "文件保存路径" - -msgid "The path to save the download file. For example:/mnt/sda1/download" -msgstr "下载文件的保存路径。例如：/mnt/sda1/download" - -msgid "Temp Path Enabled" -msgstr "启用临时目录" - -msgid "Temp Path" -msgstr "临时路径" - -msgid "The absolute and relative path can be set." -msgstr "可以设置绝对和相对路径。" - -msgid "Disk Cache Size (MiB)" -msgstr "磁盘缓存" - -msgid "The value -1 is auto and 0 is disable. In default, it is set to 64MiB." -msgstr "数值1是自动的，0是禁用的。默认设置为64MiB。" - -msgid "Disk Cache TTL (s)" -msgstr "磁盘缓存TTL" - -msgid "In default, it is set to 60s." -msgstr "默认设置为60秒。" - -msgid "Saving Management" -msgstr "保存管理" - -msgid "Default Torrent Management Mode" -msgstr "默认种子管理模式" - -msgid "Manual" -msgstr "手动" - -msgid "Automaic" -msgstr "自动" - -msgid "Torrent Category Changed" -msgstr "当种子分类修改时" - -msgid "Choose the action when torrent category changed." -msgstr "选择种子类别更改时的操作。" - -msgid "Switch torrent to Manual Mode" -msgstr "将种子切换到手动模式" - -msgid "Relocate torrent" -msgstr "重新定位种子" - -msgid "Default Save Path Changed" -msgstr "当默认保存路径修改时" - -msgid "Choose the action when default save path changed." -msgstr "选择默认保存路径更改时的操作。" - -msgid "Switch affected torrent to Manual Mode" -msgstr "将受影响的种子切换到手动模式" - -msgid "Relocate affected torrent" -msgstr "重新定位种子" - -msgid "Category Save Path Changed" -msgstr "当分类保存路径修改时" - -msgid "Choose the action when category save path changed." -msgstr "选择分类保存路径更改时的操作。" - -msgid "Torrent Export Dir" -msgstr "种子导出目录" - -msgid "The .torrent files will be copied to the target directory." -msgstr "种子文件将被复制到目标目录。例如：/etc/config" - -msgid "Finished Torrent Export Dir" -msgstr "复制种子文件" - -msgid "The .torrent files for finished downloads will be copied to the target directory." -msgstr "将已下载完成的种子文件复制到目标目录。例如：/etc/config" - -msgid "Bittorrent Settings" -msgstr "BT设置"" - -msgid "Enable DHT" -msgstr "启用DHT" - -msgid "Enable DHT (decentralized network) to find more peers" -msgstr "启用DHT(去中心化网络) 以找到更多用户。" - -msgid "Enable PeX" -msgstr "启用PeX" - -msgid "Enable Peer Exchange (PeX) to find more peers" -msgstr "启用用户交换(PeX)以找到更多用户。" - -msgid "Enable LSD" -msgstr "启用LSD" - -msgid "Enable Local Peer Discovery to find more peers" -msgstr "启用本地用户发现以找到更多用户。" - -msgid "uTP Rate Limit" -msgstr "uTP速度限制" - -msgid "Apply rate limit to µTP protocol." -msgstr "针对µTP协议进行速度限制。" - -msgid "Encryption Mode" -msgstr "加密模式" - -msgid "Enable DHT (decentralized network) to find more peers" -msgstr "使DHT（分散网络）能够找到更多的对等点。" - -msgid "Prefer Encryption" -msgstr "偏好加密" - -msgid "Require Encryption" -msgstr "强制加密" - -msgid "Disable Encryption" -msgstr "禁用加密" - -msgid "Max Connections" -msgstr "连接数限制" - -msgid "The max number of connections." -msgstr "全局最大连接数。" - -msgid "Max Connections Per Torrent" -msgstr "种子连接数限制" - -msgid "The max number of connections per torrent." -msgstr "每个种子的最大连接数。" - -msgid "Max Uploads" -msgstr "最大上传数" - -msgid "The max number of connected peers." -msgstr "全局最大上传线程数。" - -msgid "Max Uploads Per Torrent" -msgstr "种子上传限制" - -msgid "The max number of connected peers per torrent." -msgstr "每个种子上传线程最大值。" - -msgid "Share rate limit" -msgstr "分享率限制" - -msgid "Max Ratio" -msgstr "最大的分享率" - -msgid "The max ratio for seeding. -1 is to disable the seeding." -msgstr "分享的最大比例设定。-1是禁用做种。" - -msgid "Max Seeding Minutes" -msgstr "最大做种时间" - -msgid "Units: minutes" -msgstr "做种最大比例设定。单位：分钟" - -msgid "Max Ratio Action" -msgstr "达到后" - -msgid "The action when reach the max seeding ratio." -msgstr "达到设定分享率和时间后的动作。" - -msgid "Pause them" -msgstr "暂停" - -msgid "Remove them" -msgstr "删除" - -msgid "Queueing Setting" -msgstr "种子排队设置" - -msgid "Enable Torrent Queueing" -msgstr "启用种子排队" - -msgid "Maximum Active Downloads" -msgstr "最大活动的下载数" - -msgid "Max Active Uploads" -msgstr "最大活动的上传数" - -msgid "Max Active Torrents" -msgstr "最大活动的种子数" - -msgid "Ignore Slow Torrents" -msgstr "忽略慢速的种子" - -msgid "Do not count slow torrents in these limits." -msgstr "慢速的种子不包在括限制内。" - -msgid "Download rate threshold" -msgstr "下载速度阈值" - -msgid "Upload rate threshold" -msgstr "上传速度阈值" - -msgid "Units: KiB/s" -msgstr "单位：KiB/s" - -msgid "Torrent inactivity timer" -msgstr "种子不活动时间" - -msgid "Units: seconds" -msgstr "时间单位：分钟" - -msgid "WebUI Settings" -msgstr "WebUI设置" - -msgid "Username" -msgstr "" - -msgid "Password" -msgstr "" - -msgid "Use UPnP for WebUI" -msgstr "WebUI端口转发" - -msgid "Using the UPnP / NAT-PMP port of the router for connecting to WebUI." -msgstr "使用路由器的UPnP/NAT-PMP端口转发到WebUI。" - -msgid "The login name for WebUI." -msgstr "WebUI的登录用户名设置。" - -msgid "The login password for WebUI." -msgstr "WebUI用户的登录密码设置。" - -msgid "The listening port for WebUI." -msgstr "WebUI的登录端口设置。默认端口：8080" - -msgid "CSRF Protection" -msgstr "CSRF保护" - -msgid "Enable Cross-Site Request Forgery (CSRF) protection." -msgstr "启用跨站点请求伪造(CSRF)保护。" - -msgid "Clickjacking Protection" -msgstr "劫持保护" - -msgid "Enable clickjacking protection." -msgstr "启用点击劫持保护。" - -msgid "Host Header Validation" -msgstr "主机标头验证" - -msgid "Validate the host header." -msgstr "启用主机标头验证." - -msgid "Local Host Authentication" -msgstr "本地主机认证" - -msgid "Force authentication for clients on localhost." -msgstr "强制对本地主机上的客户端进行身份验证。" - -msgid "Enable Subnet Whitelist" -msgstr "使子网白名单" - -msgid "Subnet Whitelist" -msgstr "输入IP地址" - -msgid "Skip authentication for clients in the IP subnet white list." -msgstr "对IP子网白名单中的客户端跳过身份验证." - -msgid "Advance Settings" -msgstr "高级设置" - -msgid "Anonymous Mode" -msgstr "匿名模式" - -msgid "When enabled, qBittorrent will take certain measures to try" -msgstr "启用后，qBittorrent将采取某些措施隐藏其身份。" - -msgid "Super Seeding" -msgstr "超级种子" - -msgid "The super seeding mode." -msgstr "超级种子模式。" - -msgid "Limit Overhead Usage" -msgstr "开销限制" - -msgid "The overhead usage is been limitted." -msgstr "对传送总开销进行速度限制。" - -msgid "Ignore LAN Limit" -msgstr "LAN限制" - -msgid "Ignore the speed limit to LAN." -msgstr "忽略对LAN的速度限制。" - -msgid "Use os Cache" -msgstr "使用OS操作系统缓存管理" - -msgid "Max Outgoing Port" -msgstr "端口设置" - -msgid The max outgoing port."" -msgstr "最大输出端口。" - -msgid "Min Outgoing Port" -msgstr "端口设置" - -msgid "The min outgoing port." -msgstr "最小输出端口。" - -msgid "Choking Algorithm" -msgstr "数据传输算法" - -msgid "The strategy of choking algorithm." -msgstr "数据传输算法的策略。" - -msgid "Round Robin" -msgstr "负载均衡" - -msgid "Fastest Upload" -msgstr "最快上传" - -msgid "Anti-Leech" -msgstr "反吸血" - -msgid "Announce To All Trackers" -msgstr "对所有Trackers宣告" - -msgid "Announce To All Tiers" -msgstr "对所有Tiers宣告" - -msgid "configuration file" -msgstr "配置文件" - -msgid "Operation log" -msgstr "运行日志" - -msgid "This page is the log document content of qbittorrent." -msgstr "本页是qBittorrent的日志文档内容。" - -msgid "This page is the content of the configuration document under /etc/config/qbittorrent." -msgstr "本页是/etc/config/qbittorrent下的配置文档内容。" - +msgid "qbittorrent" +msgstr "qbittorrent" + +msgid "qBittorrent is a cross-platform free and open-source BitTorrent client." +msgstr "qBittorrent是一个基于 QT 的跨平台的开源 BitTorrent 客户端。" + +msgid "Default login username: admin, password: adminadmin." +msgstr "默认登录用户名：admin，密码：adminadmin。" + +msgid "Open Web Interface" +msgstr "打开Web界面" + +msgid "qbittorrent Run Status" +msgstr "qbittorrent运行状态" + +msgid "Running" +msgstr "运行中" + +msgid "Not running" +msgstr "未运行" + +msgid "Enable" +msgstr "启用" + +msgid "Port" +msgstr "端口" + +msgid "WebUI listening port" +msgstr "WebUI监听端口" + +msgid "Profile Dir" +msgstr "配置文件目录" + +msgid "Store configuration files in the Path" +msgstr "配置文件存放路径" + +msgid "Download Dir" +msgstr "下载目录" + +msgid "Store download files in the Path" +msgstr "下载文件存放目录" diff --git a/package/lean/luci-app-qbittorrent/root/etc/config/qbittorrent b/package/lean/luci-app-qbittorrent/root/etc/config/qbittorrent index 4ec138ff67..ec8dd7fd18 100644 --- a/package/lean/luci-app-qbittorrent/root/etc/config/qbittorrent +++ b/package/lean/luci-app-qbittorrent/root/etc/config/qbittorrent @@ -1,19 +1,6 @@ - -config qbittorrent 'main' - option user 'root' - option Locale 'zh' - option BTProtocol 'Both' - option DisableAutoTMMByDefault 'true' - option CategoryChanged 'false' - option DefaultSavePathChanged 'true' - option CategorySavePathChanged 'true' - option Encryption '0' - option MaxRatioAction '0' - option CSRFProtection 'false' - option SeedChokingAlgorithm 'FastestUpload' - option Enabled 'false' - option Port '8080' - option profile '/opt' - option enabled '0' - +config qbittorrent + option enable '0' + option port '8080' + option profile_dir '/etc' + option download_dir '/mnt/download' diff --git a/package/lean/luci-app-qbittorrent/root/etc/init.d/qbittorrent b/package/lean/luci-app-qbittorrent/root/etc/init.d/qbittorrent index 274aa45719..1aca40a088 100755 --- a/package/lean/luci-app-qbittorrent/root/etc/init.d/qbittorrent +++ b/package/lean/luci-app-qbittorrent/root/etc/init.d/qbittorrent @@ -1,264 +1,80 @@ #!/bin/sh /etc/rc.common -# Licensed to the public under the Apache License 2.0. -# ubus call service list - START=99 -USE_PROCD=1 - -NAME=qbittorrent -args=/usr/bin/qbittorrent-nox - -QBT_PID_FILE=/var/run/qbittorrent.pid -QBT_INI_FILE=/tmp/qBittorrent/config/qBittorrent.conf - -QBT_INSTANCE="" - -_info() { - logger -p daemon.info -t "$NAME" "$*" +get_config() +{ + config_get_bool enable "$1" enable 0 } -_err() { - logger -p daemon.err -t "$NAME" "$*" -} +config_qbittorrent() +{ + local download_dir + local port + config_get download_dir "$1" "download_dir" + config_get port "$1" "port" + mkdir -p "$download_dir" + mkdir -p "$2" "$2/qBittorrent" "$2/qBittorrent/config" + { [ "$2" != "/etc" ] && [ "$2" != "/etc/" ]; } && ln -sf "/etc/qBittorrent/ipfilter.dat" "$2/qBittorrent/ipfilter.dat" + if [ -f "$2/qBittorrent/config/qBittorrent.conf" ]; then + sed -i 's/WebUI\\Port=[0-9]*/WebUI\\Port='"$port"'/g' "$2/qBittorrent/config/qBittorrent.conf" + sed -i 's/Downloads\\SavePath=[a-z,/]*//g' "$2/qBittorrent/config/qBittorrent.conf" + echo "Downloads\SavePath=$download_dir" >> "$2/qBittorrent/config/qBittorrent.conf" + else + cat >"$2/qBittorrent/config/qBittorrent.conf"<"$QBT_INI_FILE"</dev/null 2>&1; - return 1; - } - - local confdir="qBittorrent" - [ -n "$configuration" ] && { - confdir="qBittorrent_$configuration" - } - - [ -d "$profile/$confdir/config" ] || { - mkdir -m 0755 -p "$profile/$confdir/config" - } - - [ "$user" != "root" ] && { - [ -d "$confdir" ] && { - local groupnow="$(ls -l $profile | grep $confdir | awk '{print $3})" - local usernow="$(ls -l $profile | grep $confdir | awk '{print $4})" - - [ "$usernow" != "$user" ] && { _err "Permission denied!"; return 1; } - } || { - chmod -R g+w "$profile/$confdir" - chown -R "$user":"$user" "$profile/$confdir" - } - } - - [ "$AuthSubnetWhitelistEnabled" = true ] && { - AuthSubnetWhitelist="$( echo $AuthSubnetWhitelist | sed 's/ /,/g')" - } || { - AuthSubnetWhitelist="@Invalid()" - } - - QBT_INI_FILE="$profile/$confdir/config/qBittorrent.conf" - config_QBT - - procd_open_instance $QBT_INSTANCE - procd_set_param command $args - procd_append_param command --profile="$profile" - - [ -n "$configuration" ] && { - procd_append_param command --configuration="$configuration" - } - - procd_set_param respawn - procd_set_param user $user - procd_set_param file $QBT_INI_FILE - procd_set_param pidfile $QBT_PID_FILE - procd_close_instance -} - -service_triggers() +run_qbittorrent() { - procd_add_reload_trigger "$NAME" + local enable + config_get_bool enable "$1" enable + + if [ $enable ]; then + local profile_dir + config_get profile_dir "$1" profile_dir + config_foreach config_qbittorrent "qbittorrent" "$profile_dir" + if [ "$profile_dir" != "" ]; then + qbittorrent-nox -d --profile="$profile_dir" + else + echo "No profile_dir found, stop!" + fi + + fi } -start_service() { - config_load "$NAME" - config_foreach init_QBT "$NAME" -} - -reload_service() { - restart -} - -restart() { +start() +{ stop - sleep 2 - start + local profile_path + config_load "qbittorrent" + config_foreach get_config "qbittorrent" + [ $enable -eq 0 ] && exit 0 + config_foreach run_qbittorrent "qbittorrent" +} + +stop() +{ + killall "qbittorrent-nox" >/dev/null 2>&1 } diff --git a/package/lean/luci-app-qbittorrent/root/etc/uci-defaults/luci-qbittorrent b/package/lean/luci-app-qbittorrent/root/etc/uci-defaults/luci-qbittorrent deleted file mode 100644 index dd2c37d8d8..0000000000 --- a/package/lean/luci-app-qbittorrent/root/etc/uci-defaults/luci-qbittorrent +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -uci -q batch <<-EOF >/dev/null - delete ucitrack.@qbittorrent[-1] - add ucitrack qbittorrent - set ucitrack.@qbittorrent[-1].init=qbittorrent - commit ucitrack -EOF - -if [ ."$(uci -q get qbittorrent.main)" != ."qbittorrent" ]; then - uci -q batch <<-EOF >/dev/null - add qbittorrent qbittorrent - rename qbittorrent.@qbittorrent[-1]="main" - set qbittorrent.main.enabled=0 - set qbittorrent.main.profile="/tmp" - commit qbittorrent - EOF -fi - -rm -f /tmp/luci-indexcache -exit 0 diff --git a/package/lean/luci-app-qbittorrent/root/etc/uci-defaults/qbittorrent b/package/lean/luci-app-qbittorrent/root/etc/uci-defaults/qbittorrent new file mode 100755 index 0000000000..c9995c1562 --- /dev/null +++ b/package/lean/luci-app-qbittorrent/root/etc/uci-defaults/qbittorrent @@ -0,0 +1,12 @@ +#!/bin/sh + +uci -q batch <<-EOF >/dev/null + delete ucitrack.@qbittorrent[-1] + add ucitrack qbittorrent + set ucitrack.@qbittorrent[-1].init=qbittorrent + commit ucitrack +EOF + +/etc/init.d/qbittorrent stop +rm -f /tmp/luci-indexcache +exit 0 diff --git a/package/lean/qBittorrent/Makefile b/package/lean/qBittorrent-Enhanced-Edition/Makefile similarity index 58% rename from package/lean/qBittorrent/Makefile rename to package/lean/qBittorrent-Enhanced-Edition/Makefile index 3bd02e2658..e5c2463a58 100644 --- a/package/lean/qBittorrent/Makefile +++ b/package/lean/qBittorrent-Enhanced-Edition/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=qbittorrent -PKG_VERSION:=4.1.9 -PKG_RELEASE=5 +PKG_NAME:=qBittorrent-Enhanced-Edition +PKG_VERSION:=4.2.1.10 +PKG_RELEASE=2 PKG_SOURCE:=$(PKG_NAME)-release-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/qbittorrent/qBittorrent/tar.gz/release-$(PKG_VERSION)? -PKG_HASH:=620127f73f88ed3f2b2e4195cbc641f7c27f967d3b045e45f7916c0995fd61fe +PKG_SOURCE_URL:=https://codeload.github.com/c0re100/qBittorrent-Enhanced-Edition/tar.gz/release-$(PKG_VERSION)? +PKG_HASH:=78b0116c00d791328d2ad4f84f7447e2208bf0eb5798c4da2ae4404ac00cad2b -PKG_BUILD_DIR:=$(BUILD_DIR)/qBittorrent-release-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/qBittorrent-Enhanced-Edition-release-$(PKG_VERSION) PKG_LICENSE:=GPL-2.0+ PKG_LICENSE_FILES:=COPYING @@ -19,16 +19,16 @@ PKG_USE_MIPS16:=0 include $(INCLUDE_DIR)/package.mk -define Package/qBittorrent +define Package/$(PKG_NAME) SUBMENU:=BitTorrent SECTION:=net CATEGORY:=Network TITLE:=bittorrent client programmed in C++ / Qt - URL:=https://www.qbittorrent.org/ - DEPENDS:=+qt5-core +qt5-network +qt5-xml +rblibtorrent + URL:=https://github.com/c0re100/qBittorrent-Enhanced-Edition + DEPENDS:=+qt5-core +qt5-network +qt5-xml +libtorrent-rasterbar +python3 endef -define Package/qBittorrent/description +define Package/$(PKG_NAME)/description qBittorrent is a bittorrent client programmed in C++ / Qt that uses libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg. It aims to be a good alternative to all other bittorrent clients out @@ -36,6 +36,10 @@ there. qBittorrent is fast, stable and provides unicode support as well as many features. endef +CONFIGURE_VARS += \ + QT_QMAKE="$(TOOLCHAIN_DIR)/bin" \ + PKG_CONFIG_PATH="$(TOOLCHAIN_DIR)/lib/pkgconfig" + CONFIGURE_ARGS += \ --disable-gui \ --enable-stacktrace=no \ @@ -49,11 +53,13 @@ define Build/Prepare $(SED) '//{:a;N;/<\/context>/!ba;/\/gui\//d}' `ls $(PKG_BUILD_DIR)/src/lang/qbittorrent_*.ts` endef -define Package/qBittorrent/install +define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/man/man1 $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/man/man1/qbittorrent-nox.1 $(1)/usr/man/man1/qbittorrent-nox.1 $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/qbittorrent-nox $(1)/usr/bin + $(INSTALL_DIR) $(1)/etc/qBittorrent + $(INSTALL_DATA) ./files/ipfilter.dat $(1)/etc/qBittorrent/ipfilter.dat endef -$(eval $(call BuildPackage,qBittorrent)) +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/lean/qBittorrent-Enhanced-Edition/files/ipfilter.dat b/package/lean/qBittorrent-Enhanced-Edition/files/ipfilter.dat new file mode 100644 index 0000000000..4cb41cd5db --- /dev/null +++ b/package/lean/qBittorrent-Enhanced-Edition/files/ipfilter.dat @@ -0,0 +1,293 @@ +14.17.29.0 - 14.17.44.255 , 0 , Tencent Offline +14.17.101.0 - 14.17.101.255 , 0 , Baidu Offline +14.29.92.0 - 14.29.92.255 , 0 , Xunlei Offline +14.215.177.0 - 14.215.177.255 , 0 , Baidu Offline +23.3.68.0 - 23.3.68.255 , 0 , Tencent Offline +27.221.20.0 - 27.221.21.255 , 0 , 360 +27.221.36.0 - 27.221.38.255 , 0 , Baidu Offline +36.110.198.0 - 36.110.198.255 , 0 , Baidu Offline +36.248.6.0 - 36.248.6.255 , 0 , Baidu Offline +36.250.0.0 - 36.250.0.255 , 0 , Baidu Offline +36.251.188.0 - 36.251.188.255 , 0 , Baidu Offline +42.56.64.0 - 42.56.65.255 , 0 , Tencent Offline +42.236.4.0 - 42.236.7.255 , 0 , Baidu Offline +45.113.68.0 - 45.113.71.255 , 0 , Tencent Offline +49.4.0.0 - 49.4.127.255 , 0 , HUAWEI +49.51.0.0 - 49.51.31.255 , 0 , Tencent Offline +58.48.212.0 - 58.48.212.255 , 0 , Tencent Offline +58.51.144.0 - 58.51.144.255 , 0 , Xunlei Offline +58.61.39.0 - 58.61.152.255 , 0 , Xunlei Offline +58.67.137.0 - 58.67.137.255 , 0 , Xunlei Offline +58.198.42.0 - 58.198.42.255 , 0 , Tencent Offline +58.215.118.0 - 58.215.123.255 , 0 , Baidu Offline +58.217.200.0 - 58.217.222.255 , 0 , Baidu Offline +58.220.12.0 - 58.220.12.255 , 0 , Xunlei Offline +58.222.18.0 - 58.222.25.255 , 0 , Baidu Offline +58.251.57.0 - 58.251.61.255 , 0 , Xunlei Offline +58.252.209.0 - 58.252.209.255 , 0 , Xunlei Offline +58.254.134.0 - 58.254.134.255 , 0 , Xunlei Offline +58.255.249.0 - 58.255.253.255 , 0 , Xunlei Offline +59.45.75.0 - 59.45.75.255 , 0 , Baidu Offline +59.51.81.0 - 59.51.81.255 , 0 , Baidu Offline +59.53.69.0 - 59.53.69.255 , 0 , Baidu Offline +59.53.86.0 - 59.53.86.255 , 0 , Tencent Offline +59.74.44.0 - 59.74.45.255 , 0 , Tencent Offline +60.2.237.0 - 60.2.237.255 , 0 , Tencent Offline +60.18.146.0 - 60.18.147.255 , 0 , Xunlei Offline +60.19.64.0 - 60.19.64.255 , 0 , Xunlei Offline +60.21.219.0 - 60.21.219.255 , 0 , Xunlei Offline +60.28.9.0 - 60.28.22.255 , 0 , Baidu Offline +60.160.190.0 - 60.160.190.255 , 0 , Xunlei Offline +60.211.226.0 - 60.211.226.255 , 0 , Baidu Offline +60.214.64.0 - 60.214.64.255 , 0 , Xunlei Offline +60.217.235.0 - 60.217.236.255 , 0 , Xunlei Offline +60.220.197.0 - 60.220.197.255 , 0 , Xunlei Offline +60.221.254.0 - 60.221.254.255 , 0 , Xunlei Offline +61.54.12.0 - 61.54.24.255 , 0 , Xunlei Offline +61.54.47.0 - 61.54.47.255 , 0 , Baidu Offline +61.132.226.0 - 61.132.226.255 , 0 , Baidu Offline +61.135.145.0 - 61.135.191.255 , 0 , Baidu Offline +61.137.90.0 - 61.137.90.255 , 0 , MNDISK Offline +61.137.191.0 - 61.137.191.255 , 0 , Xunlei Offline +61.138.131.0 - 61.138.131.255 , 0 , Tencent Offline +61.138.177.0 - 61.138.177.255 , 0 , Xunlei Offline +61.139.103.0 - 61.139.103.255 , 0 , Xunlei Offline +61.147.76.0 - 61.147.94.255 , 0 , Xunlei Offline +61.152.105.0 - 61.152.105.255 , 0 , Xunlei Offline +61.153.56.0 - 61.153.56.255 , 0 , Baidu Offline +61.155.149.0 - 61.155.165.255 , 0 , Baidu Offline +61.155.183.0 - 61.155.183.255 , 0 , Xunlei Offline +61.155.220.0 - 61.155.220.255 , 0 , Tencent Offline +61.160.224.0 - 61.160.224.255 , 0 , 360 +61.160.230.0 - 61.160.231.255 , 0 , Tencent Offline +61.160.253.0 - 61.160.253.255 , 0 , Tencent Offline +61.164.120.0 - 61.164.120.255 , 0 , Tencent Offline +61.164.155.0 - 61.164.155.255 , 0 , Baidu Offline +61.173.85.0 - 61.173.85.255 , 0 , Xunlei Offline +61.178.227.0 - 61.178.227.255 , 0 , Xunlei Offline +61.179.109.0 - 61.179.109.255 , 0 , Baidu Offline +61.182.137.0 - 61.182.137.255 , 0 , Baidu Offline +61.183.55.0 - 61.183.55.255 , 0 , Xunlei Offline +61.188.190.0 - 61.188.190.255 , 0 , Xunlei Offline +61.235.71.0 - 61.235.71.255 , 0 , Xunlei Offline +61.240.144.0 - 61.240.144.255 , 0 , 360 +64.251.96.0 - 64.251.111.255 , 0 , 360 +101.4.60.0 - 101.4.61.255 , 0 , 360 +101.64.181.0 - 101.64.181.255 , 0 , Baidu Offline +101.69.162.0 - 101.69.162.255 , 0 , Baidu Offline +101.71.56.0 - 101.71.56.255 , 0 , Baidu Offline +101.198.0.0 - 101.199.255.255 , 0 , 360 +101.226.4.0 - 101.226.4.255 , 0 , 360 +101.226.63.0 - 101.226.76.255 , 0 , Tencent Offline +101.226.180.0 - 101.226.180.255 , 0 , Xunlei Offline +101.227.130.0 - 101.227.143.255 , 0 , Tencent Offline +103.7.28.0 - 103.7.31.255 , 0 , Tencent Offline +103.28.8.0 - 103.28.11.255 , 0 , 360 +103.31.200.0 - 103.31.203.255 , 0 , HUAWEI +106.38.179.0 - 106.38.179.255 , 0 , Baidu Offline +106.120.159.0 - 106.120.159.255 , 0 , Baidu Offline +110.18.246.0 - 110.18.246.255 , 0 , Baidu Offline +110.188.3.0 - 110.188.3.255 , 0 , Tencent Offline +111.13.12.0 - 111.13.113.255 , 0 , Baidu Offline +111.30.135.0 - 111.30.135.255 , 0 , Tencent Offline +111.161.24.0 - 111.161.24.255 , 0 , Xunlei Offline +111.206.36.0 - 111.206.76.255 , 0 , Baidu Offline +112.25.34.0 - 112.25.34.255 , 0 , 115 Offline +112.25.60.0 - 112.25.60.255 , 0 , 360 +112.80.23.0 - 112.80.23.255 , 0 , Xunlei Offline +112.80.248.0 - 112.80.255.255 , 0 , Baidu Offline +112.87.43.0 - 112.87.43.227 , 0 , Xunlei Offline +112.90.17.0 - 112.90.17.255 , 0 , Xunlei Offline +112.117.217.0 - 112.117.217.255 , 0 , Xunlei Offline +112.253.12.0 - 112.253.12.255 , 0 , Baidu Offline +113.105.143.0 - 113.105.143.255 , 0 , 115 Offline +113.105.148.81 - 113.105.148.255 , 0 , Baidu Offline +113.107.248.0 - 113.107.248.255 , 0 , Baidu Offline +113.108.29.0 - 113.108.29.255 , 0 , Tencent Offline +113.115.10.0 - 113.115.10.255 , 0 , Tencent Offline +113.142.0.0 - 113.142.31.255 , 0 , Tencent Offline +113.200.90.0 - 113.200.90.255 , 0 , Tencent Offline +114.80.183.0 - 114.80.255.255 , 0 , Xunlei Offline +114.112.202.0 - 114.112.202.255 , 0 , Xunlei Offline +115.159.0.0 - 115.159.255.255 , 0 , Tencent Offline +115.231.38.0 - 115.231.45.255 , 0 , Xunlei Offline +115.236.96.0 - 115.236.153.255 , 0 , Tencent Offline +115.238.230.0 - 115.238.243.255 , 0 , UC Offline +115.239.210.0 - 115.239.212.255 , 0 , Baidu Offline +116.10.186.0 - 116.10.186.255 , 0 , Xunlei Offline +116.31.127.0 - 116.31.127.255 , 0 , Baidu Offline +116.55.230.0 - 116.55.255.255 , 0 , Xunlei Offline +116.57.183.0 - 116.57.255.255 , 0 , Tencent Offline +116.211.117.0 - 116.211.117.255 , 0 , Baidu Offline +116.253.190.0 - 116.253.190.255 , 0 , Tencent Offline +117.21.185.0 - 117.21.185.255 , 0 , Tencent Offline +117.25.132.0 - 117.25.132.255 , 0 , Tencent Offline +117.27.148.0 - 117.27.149.255 , 0 , Baidu Offline +117.34.6.0 - 117.34.6.255 , 0 , Tencent Offline +117.34.28.0 - 117.34.37.255 , 0 , Baidu Offline +117.34.91.0 - 117.34.91.255 , 0 , Xunlei Offline +117.34.112.0 - 117.34.112.255 , 0 , Baidu Offline +117.78.0.0 - 117.78.23.255 , 0 , HUAWEI +118.122.36.0 - 118.122.88.255 , 0 , Xunlei Offline +118.123.97.0 - 118.123.97.255 , 0 , Tencent Offline +118.123.116.0 - 118.123.223.255 , 0 , Baidu Offline +118.180.6.0 - 118.180.6.255 , 0 , Baidu Offline +119.75.208.0 - 119.75.223.255 , 0 , Baidu Offline +119.84.11.0 - 119.84.11.255 , 0 , Xunlei Offline +119.84.72.0 - 119.84.72.255 , 0 , Tencent Offline +119.84.110.0 - 119.84.114.255 , 0 , Xunlei Offline +119.97.178.0 - 119.97.183.255 , 0 , Xunlei Offline +119.120.94.0 - 119.120.94.255 , 0 , Xunlei Offline +119.134.253.0 - 119.134.253.255 , 0 , Baidu Offline +119.144.9.0 - 119.144.9.255 , 0 , Xunlei Offline +119.147.15.0 - 119.147.41.255 , 0 , Tencent Offline +119.147.99.0 - 119.147.249.255 , 0 , 115 Offline +119.167.241.0 - 119.167.241.255 , 0 , Tencent Offline +119.167.246.0 - 119.167.246.255 , 0 , Baidu Offline +119.178.12.0 - 119.178.12.255 , 0 , Xunlei Offline +119.188.11.0 - 119.188.132.255 , 0 , Xunlei Offline +119.189.1.0 - 119.189.1.255 , 0 , Xunlei Offline +120.52.114.0 - 120.52.114.255 , 0 , Baidu Offline +121.9.209.0 - 121.9.255.255 , 0 , Xunlei Offline +121.10.24.0 - 121.10.137.255 , 0 , Xunlei Offline +121.11.68.0 - 121.11.68.255 , 0 , Tencent Offline +121.12.94.0 - 121.12.94.255 , 0 , Baidu Offline +121.14.35.0 - 121.14.35.255 , 0 , Baidu Offline +121.14.82.0 - 121.14.97.255 , 0 , Xunlei Offline +121.14.131.0 - 121.14.131.255 , 0 , Tencent Offline +121.14.222.0 - 121.14.228.255 , 0 , Xunlei Offline +122.70.142.0 - 122.70.142.255 , 0 , Baidu Offline +122.136.46.0 - 122.136.46.255 , 0 , Baidu Offline +122.141.227.0 - 122.141.235.255 , 0 , Xunlei Offline +122.143.1.0 - 122.143.6.255 , 0 , Xunlei Offline +122.143.15.0 - 122.143.15.255 , 0 , 360 +122.192.32.0 - 122.192.32.255 , 0 , Tencent Offline +122.193.41.0 - 122.193.41.255 , 0 , Baidu Offline +122.224.10.0 - 122.224.10.255 , 0 , Baidu Offline +122.227.15.0 - 122.227.15.255 , 0 , Tencent Offline +122.228.218.0 - 122.228.234.255 , 0 , Baidu Offline +122.228.241.0 - 122.228.255.255 , 0 , Xunlei Offline +123.66.33.0 - 123.66.33.255 , 0 , Xunlei Offline +123.125.64.0 - 123.125.115.255 , 0 , Baidu Offline +123.125.160.0 - 123.125.161.255 , 0 , 360 +123.129.219.0 - 123.129.255.255 , 0 , Xunlei Offline +123.138.102.0 - 123.138.239.255 , 0 , Tencent Offline +123.151.44.0 - 123.151.138.255 , 0 , Tencent Offline +123.162.190.0 - 123.162.191.255 , 0 , Xunlei Offline +123.183.223.0 - 123.183.223.255 , 0 , Xunlei Offline +124.89.102.0 - 124.89.103.255 , 0 , Tencent Offline +124.95.156.0 - 124.95.174.255 , 0 , Xunlei Offline +124.115.1.0 - 124.115.14.255 , 0 , Tencent Offline +124.115.215.0 - 124.115.215.255 , 0 , Baidu Offline +124.160.163.0 - 124.160.171.255 , 0 , Tencent Offline +124.161.23.0 - 124.161.23.255 , 0 , Tencent Offline +124.165.216.0 - 124.165.216.255 , 0 , Baidu Offline +124.193.227.0 - 124.193.227.255 , 0 , Baidu Offline +124.225.122.0 - 124.225.122.255 , 0 , Tencent Offline +124.228.42.0 - 124.228.42.255 , 0 , Tencent Offline +124.232.148.0 - 124.232.148.255 , 0 , Xunlei Offline +124.238.238.0 - 124.238.238.255 , 0 , Baidu Offline +125.39.72.0 - 125.39.79.255 , 0 , Xunlei Offline +125.39.126.0 - 125.39.255.255 , 0 , Tencent Offline +125.46.42.0 - 125.46.42.255 , 0 , Xunlei Offline +125.78.242.0 - 125.78.247.255 , 0 , Xunlei Offline +125.218.29.0 - 125.218.29.255 , 0 , Tencent Offline +125.221.46.0 - 125.221.46.255 , 0 , Xunlei Offline +140.206.165.0 - 140.206.165.255 , 0 , Tencent Offline +159.226.50.0 - 159.226.50.255 , 0 , Baidu Offline +162.105.207.0 - 162.105.207.255 , 0 , Baidu Offline +171.111.152.0 - 171.112.96.255 , 0 , Baidu Offline +175.155.115.0 - 175.155.116.255 , 0 , Tencent Offline +180.76.0.0 - 180.76.255.255 , 0 , Baidu Offline +180.96.0.0 - 180.96.1.255 , 0 , Tencent Offline +180.97.7.0 - 180.97.7.255 , 0 , Tencent Offline +180.97.33.0 - 180.97.34.255 , 0 , Baidu Offline +180.97.151.0 - 180.97.152.255 , 0 , Xunlei Offline +180.149.131.0 - 180.149.145.255 , 0 , Baidu Offline +180.153.91.0 - 180.153.115.255 , 0 , Xunlei Offline +180.153.235.0 - 180.153.235.255 , 0 , 360 +182.86.197.0 - 182.86.197.255 , 0 , Baidu Offline +182.118.13.0 - 182.118.125.255 , 0 , Xunlei Offline +182.130.10.0 - 182.130.11.255 , 0 , Tencent Offline +182.131.8.0 - 182.131.11.255 , 0 , Tencent Offline +182.140.134.0 - 182.140.177.255 , 0 , Tencent Offline +182.140.227.0 - 182.140.227.255 , 0 , 360 +182.150.1.0 - 182.150.1.255 , 0 , Baidu Offline +182.247.251.0 - 182.247.251.255 , 0 , Xunlei Offline +182.254.0.0 - 182.254.255.255 , 0 , Tencent Offline +183.60.15.0 - 183.60.15.255 , 0 , Tencent Offline +183.60.131.0 - 183.60.131.255 , 0 , Baidu Offline +183.60.139.0 - 183.60.139.255 , 0 , 115 Offline +183.60.208.0 - 183.60.209.255 , 0 , Xunlei Offline +183.60.211.0 - 183.60.211.255 , 0 , 360 +183.60.235.0 - 183.60.235.255 , 0 , Baidu Offline +183.61.49.0 - 183.61.49.255 , 0 , Tencent Offline +183.61.133.0 - 183.61.133.255 , 0 , Baidu Offline +183.63.33.0 - 183.63.33.255 , 0 , Xunlei Offline +183.94.216.0 - 183.94.239.255 , 0 , Xunlei Offline +183.131.32.0 - 183.131.39.255 , 0 , Baidu Offline +183.136.133.0 - 183.136.133.255 , 0 , 360 +183.136.156.0 - 183.136.158.255 , 0 , Xunlei Offline +183.136.218.0 - 183.136.218.255 , 0 , Baidu Offline +183.157.36.0 - 183.157.36.255 , 0 , Xunlei Offline +183.221.245.0 - 183.221.245.255 , 0 , Baidu Offline +183.232.22.0 - 183.232.22.255 , 0 , Baidu Offline +202.38.194.0 - 202.38.194.255 , 0 , Tencent Offline +202.100.78.0 - 202.100.78.255 , 0 , Tencent Offline +202.105.139.0 - 202.105.139.255 , 0 , Xunlei Offline +202.105.182.0 - 202.105.182.255 , 0 , Tencent Offline +202.108.11.0 - 202.108.250.255 , 0 , Baidu Offline +203.195.64.0 - 203.195.95.255 , 0 , Tencent Offline +203.195.128.0 - 203.195.255.255 , 0 , Tencent Offline +203.205.128.0 - 203.205.255.255 , 0 , Tencent Offline +210.38.3.0 - 210.38.3.255 , 0 , Tencent Offline +210.39.2.0 - 210.39.2.255 , 0 , Tencent Offline +211.90.25.0 - 211.90.25.255 , 0 , Baidu Offline +211.98.168.0 - 211.98.171.255 , 0 , Xunlei Offline +211.137.100.0 - 211.137.100.255 , 0 , Xunlei Offline +211.151.210.0 - 211.151.210.255 , 0 , 115 Offline +211.162.73.0 - 211.162.73.255 , 0 , Xunlei Offline +218.6.13.0 - 218.6.13.255 , 0 , Xunlei Offline +218.8.242.0 - 218.8.242.255 , 0 , Tencent Offline +218.21.68.0 - 218.21.68.255 , 0 , Xunlei Offline +218.22.90.0 - 218.22.90.255 , 0 , Tencent Offline +218.26.232.0 - 218.26.232.255 , 0 , Xunlei Offline +218.30.73.0 - 218.30.73.255 , 0 , Tencent Offline +218.59.144.0 - 218.59.144.255 , 0 , Xunlei Offline +218.60.11.0 - 218.60.11.255 , 0 , Tencent Offline +218.75.140.0 - 218.75.140.255 , 0 , Baidu Offline +218.75.172.0 - 218.75.172.255 , 0 , Xunlei Offline +218.199.46.0 - 218.199.46.255 , 0 , Tencent Offline +219.129.83.0 - 219.129.83.255 , 0 , Xunlei Offline +219.134.132.0 - 219.134.132.255 , 0 , Xunlei Offline +219.151.4.0 - 219.151.4.255 , 0 , Tencent Offline +219.159.248.0 - 219.159.248.255 , 0 , MNDISK Offline +220.113.9.0 - 220.113.9.255 , 0 , Xunlei Offline +220.115.240.0 - 220.115.240.255 , 0 , Xunlei Offline +220.161.209.0 - 220.161.209.255 , 0 , Baidu Offline +220.170.192.0 - 220.170.192.255 , 0 , Tencent Offline +220.181.5.0 - 220.181.167.255 , 0 , Baidu Offline +220.249.103.0 - 220.249.103.255 , 0 , Xunlei Offline +221.4.246.0 - 221.4.246.255 , 0 , Xunlei Offline +221.5.8.0 - 221.5.8.255 , 0 , Xunlei Offline +221.203.176.0 - 221.204.232.255 , 0 , Xunlei Offline +221.215.87.0 - 221.215.87.255 , 0 , Xunlei Offline +221.233.79.0 - 221.233.79.255 , 0 , Baidu Offline +221.235.189.0 - 221.235.205.255 , 0 , Xunlei Offline +221.236.21.0 - 221.236.30.255 , 0 , Tencent Offline +221.238.25.0 - 221.238.25.255 , 0 , Xunlei Offline +222.24.133.0 - 222.24.133.255 , 0 , Tencent Offline +222.28.155.0 - 222.28.155.255 , 0 , Tencent Offline +222.73.49.0 - 222.73.133.255 , 0 , Xunlei Offline +222.73.183.0 - 222.73.183.255 , 0 , Tencent Offline +222.133.46.0 - 222.133.46.255 , 0 , Baidu Offline +222.141.53.0 - 222.141.53.255 , 0 , Xunlei Offline +222.141.220.0 - 222.141.220.255 , 0 , Tencent Offline +222.161.212.0 - 222.161.255.255 , 0 , Xunlei Offline +222.186.17.0 - 222.186.19.255 , 0 , Xunlei Offline +222.186.55.0 - 222.186.55.255 , 0 , Baidu Offline +222.199.144.0 - 222.199.191.255 , 0 , Baidu Offline +222.211.64.0 - 222.211.64.255 , 0 , Baidu Offline +222.215.119.0 - 222.215.119.255 , 0 , Tencent Offline +222.216.190.0 - 222.216.190.255 , 0 , Baidu Offline +222.218.45.0 - 222.218.45.255 , 0 , Baidu Offline diff --git a/package/lean/qBittorrent/patches/001-remove-ico-not-for-webui.patch b/package/lean/qBittorrent/patches/001-remove-ico-not-for-webui.patch deleted file mode 100644 index ee27bbaca4..0000000000 --- a/package/lean/qBittorrent/patches/001-remove-ico-not-for-webui.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- a/src/icons/icons.qrc -+++ b/src/icons/icons.qrc -@@ -250,38 +250,16 @@ - flags/zm.svg - flags/zw.svg - L.gif -- loading.png - qbt-theme/application-exit.svg -- qbt-theme/application-rss+xml.svg -- qbt-theme/application-x-mswinurl.svg - qbt-theme/checked.svg - qbt-theme/configure.svg -- qbt-theme/dialog-cancel.svg -- qbt-theme/dialog-information.svg -- qbt-theme/dialog-warning.svg - qbt-theme/document-edit-verify.svg - qbt-theme/document-edit.svg -- qbt-theme/document-encrypt.svg -- qbt-theme/document-import.svg -- qbt-theme/document-new.svg -- qbt-theme/document-properties.svg -- qbt-theme/document-save.svg -- qbt-theme/download.svg -- qbt-theme/edit-clear-history.svg - qbt-theme/edit-clear.svg - qbt-theme/edit-copy.svg -- qbt-theme/edit-cut.svg - qbt-theme/edit-delete.svg -- qbt-theme/edit-find-user.svg - qbt-theme/edit-find.svg -- qbt-theme/edit-paste.svg - qbt-theme/edit-rename.svg -- qbt-theme/folder-documents.svg -- qbt-theme/folder-download.svg -- qbt-theme/folder-new.svg -- qbt-theme/folder-remote.svg -- qbt-theme/gear.svg -- qbt-theme/gear32.svg - qbt-theme/go-bottom.svg - qbt-theme/go-down.svg - qbt-theme/go-top.svg -@@ -295,43 +273,15 @@ - qbt-theme/kt-set-max-upload-speed.png - qbt-theme/list-add.svg - qbt-theme/list-remove.svg -- qbt-theme/mail-folder-inbox.svg -- qbt-theme/mail-mark-read.svg - qbt-theme/media-playback-pause.svg - qbt-theme/media-playback-start.svg - qbt-theme/media-seek-forward.svg -- qbt-theme/network-server.svg -- qbt-theme/network-wired.svg -- qbt-theme/object-locked.svg -- qbt-theme/office-chart-line.svg -- qbt-theme/preferences-desktop.svg -- qbt-theme/preferences-other.svg -- qbt-theme/preferences-system-network.svg -- qbt-theme/preferences-web-browser-cookies.svg -- qbt-theme/rss-config.png - qbt-theme/security-high.svg - qbt-theme/security-low.svg -- qbt-theme/services.svg -- qbt-theme/speedometer.svg - qbt-theme/system-log-out.svg -- qbt-theme/tab-close.svg -- qbt-theme/task-attention.svg -- qbt-theme/task-complete.png -- qbt-theme/task-ongoing.png -- qbt-theme/task-reject.png -- qbt-theme/text-plain.svg -- qbt-theme/tools-report-bug.svg -- qbt-theme/unavailable.svg -- qbt-theme/user-group-delete.svg -- qbt-theme/user-group-new.svg -- qbt-theme/view-calendar-journal.svg - qbt-theme/view-categories.svg -- qbt-theme/view-filter.svg -- qbt-theme/view-preview.svg -- qbt-theme/view-refresh.svg - qbt-theme/view-statistics.svg - qbt-theme/wallet-open.svg -- qbt-theme/webui.svg - skin/arrow-right.gif - skin/bg-dropdown.gif - skin/bg-handle-horizontal.gif -@@ -342,7 +292,6 @@ - skin/completed.svg - skin/connected.svg - skin/disconnected.svg -- skin/dock-tabs.gif - skin/download.svg - skin/downloading.svg - skin/error.svg -@@ -353,14 +302,11 @@ - skin/handle-icon-horizontal.gif - skin/handle-icon.gif - skin/knob.gif -- skin/logo-blank.gif - skin/logo.gif - skin/logo2.gif - skin/mascot.png - skin/paused.svg - skin/qbittorrent-tray.svg -- skin/qbittorrent-tray-dark.svg -- skin/qbittorrent-tray-light.svg - skin/qbittorrent32.png - skin/queued.svg - skin/ratio.svg -@@ -370,17 +316,12 @@ - skin/spacer.gif - skin/spinner-placeholder.gif - skin/spinner.gif -- skin/splash.png - skin/stalledDL.svg - skin/stalledUP.svg - skin/tabs.gif - skin/toolbox-divider.gif -- skin/toolbox-divider2.gif - skin/uploading.svg - slow.png - slow_off.png -- sphere.png -- sphere2.png -- url.png - - diff --git a/package/lean/qBittorrent/patches/002-add-autoban-function.patch b/package/lean/qBittorrent/patches/002-add-autoban-function.patch deleted file mode 100644 index 8de0f1e47b..0000000000 --- a/package/lean/qBittorrent/patches/002-add-autoban-function.patch +++ /dev/null @@ -1,807 +0,0 @@ ---- a/src/base/bittorrent/peerinfo.cpp -+++ b/src/base/bittorrent/peerinfo.cpp -@@ -186,11 +186,26 @@ PeerAddress PeerInfo::address() const - m_nativeInfo.ip.port()); - } - -+int PeerInfo::port() const -+{ -+ return m_nativeInfo.ip.port(); -+} -+ - QString PeerInfo::client() const - { - return QString::fromStdString(m_nativeInfo.client); - } - -+QString PeerInfo::pid() const -+{ -+ return QString::fromStdString(m_nativeInfo.pid.to_string()); -+} -+ -+QString PeerInfo::pidtoclient() const -+{ -+ return QString::fromStdString(libt::identify_client(m_nativeInfo.pid)); -+} -+ - qreal PeerInfo::progress() const - { - return m_nativeInfo.progress; ---- a/src/base/bittorrent/peerinfo.h -+++ b/src/base/bittorrent/peerinfo.h -@@ -34,6 +34,7 @@ - #include - - #include -+#include - - namespace BitTorrent - { -@@ -85,7 +86,10 @@ namespace BitTorrent - bool isPlaintextEncrypted() const; - - PeerAddress address() const; -+ int port() const; - QString client() const; -+ QString pid() const; -+ QString pidtoclient() const; - qreal progress() const; - int payloadUpSpeed() const; - int payloadDownSpeed() const; ---- a/src/base/bittorrent/session.cpp -+++ b/src/base/bittorrent/session.cpp -@@ -69,6 +69,7 @@ - #endif - - #include "base/algorithm.h" -+#include "base/bittorrent/peerinfo.h" - #include "base/exceptions.h" - #include "base/global.h" - #include "base/logger.h" -@@ -335,6 +336,8 @@ Session::Session(QObject *parent) - , m_isAltGlobalSpeedLimitEnabled(BITTORRENT_SESSION_KEY("UseAlternativeGlobalSpeedLimit"), false) - , m_isBandwidthSchedulerEnabled(BITTORRENT_SESSION_KEY("BandwidthSchedulerEnabled"), false) - , m_saveResumeDataInterval(BITTORRENT_SESSION_KEY("SaveResumeDataInterval"), 60) -+ , m_autoBanUnknownPeer(BITTORRENT_SESSION_KEY("AutoBanUnknownPeer"), true) -+ , m_showTrackerAuthWindow(BITTORRENT_SESSION_KEY("ShowTrackerAuthWindow"), true) - , m_port(BITTORRENT_SESSION_KEY("Port"), 8999) - , m_useRandomPort(BITTORRENT_SESSION_KEY("UseRandomPort"), false) - , m_networkInterface(BITTORRENT_SESSION_KEY("Interface")) -@@ -502,6 +505,7 @@ Session::Session(QObject *parent) - libt::ip_filter filter; - processBannedIPs(filter); - m_nativeSession->set_ip_filter(filter); -+ loadOfflineFilter(); - } - - m_categories = map_cast(m_storedCategories); -@@ -518,6 +522,17 @@ Session::Session(QObject *parent) - connect(m_refreshTimer, &QTimer::timeout, this, &Session::refresh); - m_refreshTimer->start(); - -+ // Unban Timer -+ m_unbanTimer = new QTimer(this); -+ m_unbanTimer->setInterval(500); -+ connect(m_unbanTimer, &QTimer::timeout, this, &Session::processUnbanRequest); -+ -+ // Ban Timer -+ m_banTimer = new QTimer(this); -+ m_banTimer->setInterval(500); -+ connect(m_banTimer, &QTimer::timeout, this, &Session::autoBanBadClient); -+ m_banTimer->start(); -+ - m_statistics = new Statistics(this); - - updateSeedingLimitTimer(); -@@ -1077,6 +1092,7 @@ void Session::configure() - enableIPFilter(); - else - disableIPFilter(); -+ loadOfflineFilter(); - m_IPFilteringChanged = false; - } - -@@ -1905,6 +1921,95 @@ void Session::banIP(const QString &ip) - } - } - -+bool Session::checkAccessFlags(const QString &ip) -+{ -+ libt::ip_filter filter = m_nativeSession->get_ip_filter(); -+ boost::system::error_code ec; -+ libt::address addr = libt::address::from_string(ip.toLatin1().constData(), ec); -+ Q_ASSERT(!ec); -+ if (ec) return false; -+ return filter.access(addr); -+} -+ -+void Session::tempblockIP(const QString &ip) -+{ -+ libt::ip_filter filter = m_nativeSession->get_ip_filter(); -+ boost::system::error_code ec; -+ libt::address addr = libt::address::from_string(ip.toLatin1().constData(), ec); -+ Q_ASSERT(!ec); -+ if (ec) return; -+ filter.add_rule(addr, addr, libt::ip_filter::blocked); -+ m_nativeSession->set_ip_filter(filter); -+ insertQueue(ip); -+} -+ -+void Session::removeBlockedIP(const QString &ip) -+{ -+ libt::ip_filter filter = m_nativeSession->get_ip_filter(); -+ boost::system::error_code ec; -+ libt::address addr = libt::address::from_string(ip.toLatin1().constData(), ec); -+ Q_ASSERT(!ec); -+ if (ec) return; -+ filter.add_rule(addr, addr, 0); -+ m_nativeSession->set_ip_filter(filter); -+} -+ -+void Session::eraseIPFilter() -+{ -+ q_bannedIPs.clear(); -+ q_unbanTime.clear(); -+ if (isIPFilteringEnabled()) { -+ enableIPFilter(); -+ } else { -+ disableIPFilter(); -+ loadOfflineFilter(); -+ } -+} -+ -+void Session::autoBanBadClient() -+{ -+ const BitTorrent::SessionStatus tStatus = BitTorrent::Session::instance()->status(); -+ if (tStatus.peersCount > 0) { -+ bool m_AutoBan = BitTorrent::Session::instance()->isAutoBanUnknownPeerEnabled(); -+ foreach (BitTorrent::TorrentHandle *const torrent, BitTorrent::Session::instance()->torrents()) { -+ QList peers = torrent->peers(); -+ foreach (const BitTorrent::PeerInfo &peer, peers) { -+ BitTorrent::PeerAddress addr = peer.address(); -+ if (addr.ip.isNull()) continue; -+ QString ip = addr.ip.toString(); -+ int port = peer.port(); -+ QString client = peer.client(); -+ QString ptoc = peer.pidtoclient(); -+ QString pid = peer.pid().left(8); -+ QString country = peer.country(); -+ -+ QRegExp IDFilter("-(XL|SD|XF|QD|BN|DL)(\\d+)-"); -+ QRegExp UAFilter("\\d+.\\d+.\\d+.\\d+"); -+ if (IDFilter.exactMatch(pid) || UAFilter.exactMatch(client)) { -+ qDebug("Auto Banning bad Peer %s...", ip.toLocal8Bit().data()); -+ Logger::instance()->addMessage(tr("Auto banning bad Peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country)); -+ tempblockIP(ip); -+ continue; -+ } -+ -+ if(m_AutoBan) { -+ if (client.contains("Unknown") && country == "CN") { -+ qDebug("Auto Banning Unknown Peer %s...", ip.toLocal8Bit().data()); -+ Logger::instance()->addMessage(tr("Auto banning Unknown Peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country)); -+ tempblockIP(ip); -+ continue; -+ } -+ if (port >= 65000 && country == "CN" && client.contains("Transmission")) { -+ qDebug("Auto Banning Offline Downloader %s...", ip.toLocal8Bit().data()); -+ Logger::instance()->addMessage(tr("Auto banning Offline Downloader '%1:%2'...'%3'...'%4'...'%5'").arg(ip).arg(port).arg(pid).arg(ptoc).arg(country)); -+ tempblockIP(ip); -+ } -+ } -+ } -+ } -+ } -+} -+ - // Delete a torrent from the session, given its hash - // deleteLocalFiles = true means that the torrent will be removed from the hard-drive too - bool Session::deleteTorrent(const QString &hash, bool deleteLocalFiles) -@@ -2787,6 +2892,30 @@ void Session::setSaveResumeDataInterval( - } - } - -+bool Session::isAutoBanUnknownPeerEnabled() const -+{ -+ return m_autoBanUnknownPeer; -+} -+ -+void Session::setAutoBanUnknownPeer(bool value) -+{ -+ if (value != isAutoBanUnknownPeerEnabled()) { -+ m_autoBanUnknownPeer = value; -+ } -+} -+ -+bool Session::isShowTrackerAuthWindow() const -+{ -+ return m_showTrackerAuthWindow; -+} -+ -+void Session::setShowTrackerAuthWindow(bool value) -+{ -+ if (value != isShowTrackerAuthWindow()) { -+ m_showTrackerAuthWindow = value; -+ } -+} -+ - int Session::port() const - { - static int randomPort = Utils::Random::rand(1024, 65535); -@@ -3877,6 +4006,220 @@ void Session::disableIPFilter() - m_nativeSession->set_ip_filter(filter); - } - -+// Insert banned IP to Queue -+void Session::insertQueue(QString ip) -+{ -+ q_bannedIPs.enqueue(ip); -+ q_unbanTime.enqueue(QDateTime::currentMSecsSinceEpoch() + 60 * 60 * 1000); -+ -+ if (!m_unbanTimer->isActive()) { -+ m_unbanTimer->start(); -+ } -+} -+ -+// Process Unban Queue -+void Session::processUnbanRequest() -+{ -+ if (q_bannedIPs.isEmpty() && q_unbanTime.isEmpty()) { -+ m_unbanTimer->stop(); -+ } -+ else if (m_isActive) { -+ return; -+ } -+ else { -+ m_isActive = true; -+ int64_t currentTime = QDateTime::currentMSecsSinceEpoch(); -+ int64_t nextTime = q_unbanTime.dequeue(); -+ int delayTime = int(nextTime - currentTime); -+ QString nextIP = q_bannedIPs.dequeue(); -+ if (delayTime < 0) { -+ QTimer::singleShot(0, [=] { BitTorrent::Session::instance()->removeBlockedIP(nextIP); m_isActive = false; }); -+ } -+ else { -+ QTimer::singleShot(delayTime, [=] { BitTorrent::Session::instance()->removeBlockedIP(nextIP); m_isActive = false; }); -+ } -+ } -+} -+ -+// Handle ipfilter.dat -+int trim(char* const data, int start, int end) -+{ -+ if (start >= end) return start; -+ int newStart = start; -+ -+ for (int i = start; i <= end; ++i) { -+ if (isspace(data[i]) != 0) { -+ data[i] = '\0'; -+ } -+ else { -+ newStart = i; -+ break; -+ } -+ } -+ -+ for (int i = end; i >= start; --i) { -+ if (isspace(data[i]) != 0) -+ data[i] = '\0'; -+ else -+ break; -+ } -+ -+ return newStart; -+} -+ -+int findAndNullDelimiter(char *const data, char delimiter, int start, int end) -+{ -+ for (int i = start; i <= end; ++i) { -+ if (data[i] == delimiter) { -+ data[i] = '\0'; -+ return i; -+ } -+ } -+ -+ return -1; -+} -+ -+int Session::parseOfflineFilterFile(QString ipDat, libt::ip_filter &filter) -+{ -+ int ruleCount = 0; -+ QFile file(ipDat); -+ if (!file.exists()) return ruleCount; -+ -+ if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { -+ LogMsg(tr("I/O Error: Could not open IP filter file in read mode."), Log::CRITICAL); -+ return ruleCount; -+ } -+ -+ std::vector buffer(2 * 1024 * 1024, 0); // seems a bit faster than QVector -+ qint64 bytesRead = 0; -+ int offset = 0; -+ int start = 0; -+ int endOfLine = -1; -+ int nbLine = 0; -+ -+ while (true) { -+ bytesRead = file.read(buffer.data() + offset, 2 * 1024 * 1024 - offset - 1); -+ if (bytesRead < 0) -+ break; -+ int dataSize = bytesRead + offset; -+ if (bytesRead == 0 && dataSize == 0) -+ break; -+ -+ for (start = 0; start < dataSize; ++start) { -+ endOfLine = -1; -+ // The file might have ended without the last line having a newline -+ if (!(bytesRead == 0 && dataSize > 0)) { -+ for (int i = start; i < dataSize; ++i) { -+ if (buffer[i] == '\n') { -+ endOfLine = i; -+ // We need to NULL the newline in case the line has only an IP range. -+ // In that case the parser won't work for the end IP, because it ends -+ // with the newline and not with a number. -+ buffer[i] = '\0'; -+ break; -+ } -+ } -+ } -+ else { -+ endOfLine = dataSize; -+ buffer[dataSize] = '\0'; -+ } -+ -+ if (endOfLine == -1) { -+ // read the next chunk from file -+ // but first move(copy) the leftover data to the front of the buffer -+ offset = dataSize - start; -+ memmove(buffer.data(), buffer.data() + start, offset); -+ break; -+ } -+ else { -+ ++nbLine; -+ } -+ -+ if ((buffer[start] == '#') -+ || ((buffer[start] == '/') && ((start + 1 < dataSize) && (buffer[start + 1] == '/')))) { -+ start = endOfLine; -+ continue; -+ } -+ -+ // Each line should follow this format: -+ // 001.009.096.105 - 001.009.096.105 , 000 , Some organization -+ // The 3rd entry is access level and if above 127 the IP range isn't blocked. -+ int firstComma = findAndNullDelimiter(buffer.data(), ',', start, endOfLine); -+ if (firstComma != -1) -+ findAndNullDelimiter(buffer.data(), ',', firstComma + 1, endOfLine); -+ -+ // Check if there is an access value (apparently not mandatory) -+ if (firstComma != -1) { -+ // There is possibly one -+ const long int nbAccess = strtol(buffer.data() + firstComma + 1, nullptr, 10); -+ // Ignoring this rule because access value is too high -+ if (nbAccess > 127L) { -+ start = endOfLine; -+ continue; -+ } -+ } -+ -+ // IP Range should be split by a dash -+ int endOfIPRange = ((firstComma == -1) ? (endOfLine - 1) : (firstComma - 1)); -+ int delimIP = findAndNullDelimiter(buffer.data(), '-', start, endOfIPRange); -+ if (delimIP == -1) { -+ start = endOfLine; -+ continue; -+ } -+ -+ boost::system::error_code ec; -+ int newStart = trim(buffer.data(), start, delimIP - 1); -+ libt::address startAddr = libt::address::from_string(buffer.data() + newStart, ec); -+ Q_ASSERT(!ec); -+ if (ec) { -+ start = endOfLine; -+ continue; -+ } -+ -+ newStart = trim(buffer.data(), delimIP + 1, endOfIPRange); -+ libt::address endAddr = libt::address::from_string(buffer.data() + newStart, ec); -+ Q_ASSERT(!ec); -+ if (ec) { -+ start = endOfLine; -+ continue; -+ } -+ -+ if ((startAddr.is_v4() != endAddr.is_v4()) -+ || (startAddr.is_v6() != endAddr.is_v6())) { -+ start = endOfLine; -+ continue; -+ } -+ -+ start = endOfLine; -+ -+ filter.add_rule(startAddr, endAddr, libt::ip_filter::blocked); -+ ++ruleCount; -+ } -+ -+ if (start >= dataSize) -+ offset = 0; -+ } -+ -+ return ruleCount; -+} -+ -+void Session::loadOfflineFilter() { -+ int Count = 0; -+ libt::ip_filter offlineFilter = m_nativeSession->get_ip_filter(); -+ -+#if defined(Q_OS_WIN) -+ Count = parseOfflineFilterFile("./ipfilter.dat", offlineFilter); -+#endif -+ -+#if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) -+ Count = parseOfflineFilterFile(QDir::home().absoluteFilePath(".config")+"/qBittorrent/ipfilter.dat", offlineFilter); -+#endif -+ -+ m_nativeSession->set_ip_filter(offlineFilter); -+ Logger::instance()->addMessage(tr("Successfully parsed the offline downloader IP filter: %1 rules were applied.", "%1 is a number").arg(Count)); -+} -+ - void Session::recursiveTorrentDownload(const InfoHash &hash) - { - TorrentHandle *const torrent = m_torrents.value(hash); -@@ -4063,6 +4406,7 @@ void Session::handleIPFilterParsed(int r - } - Logger::instance()->addMessage(tr("Successfully parsed the provided IP filter: %1 rules were applied.", "%1 is a number").arg(ruleCount)); - emit IPFilterParsed(false, ruleCount); -+ loadOfflineFilter(); - } - - void Session::handleIPFilterError() ---- a/src/base/bittorrent/session.h -+++ b/src/base/bittorrent/session.h -@@ -40,8 +40,10 @@ - #include - #include - #include -+#include - #include - #include -+#include - #include - #include - -@@ -341,6 +343,10 @@ namespace BitTorrent - - uint saveResumeDataInterval() const; - void setSaveResumeDataInterval(uint value); -+ bool isAutoBanUnknownPeerEnabled() const; -+ void setAutoBanUnknownPeer(bool value); -+ bool isShowTrackerAuthWindow() const; -+ void setShowTrackerAuthWindow(bool value); - int port() const; - void setPort(int port); - bool useRandomPort() const; -@@ -467,6 +473,19 @@ namespace BitTorrent - void setMaxRatioAction(MaxRatioAction act); - - void banIP(const QString &ip); -+ bool checkAccessFlags(const QString &ip); -+ void tempblockIP(const QString &ip); -+ void removeBlockedIP(const QString &ip); -+ void eraseIPFilter(); -+ void autoBanBadClient(); -+ -+ // Unban Timer -+ bool m_isActive = false; -+ QQueue q_bannedIPs; -+ QQueue q_unbanTime; -+ QTimer *m_unbanTimer; -+ QTimer *m_banTimer; -+ void insertQueue(QString ip); - - bool isKnownTorrent(const InfoHash &hash) const; - bool addTorrent(QString source, const AddTorrentParams ¶ms = AddTorrentParams()); -@@ -546,6 +565,9 @@ namespace BitTorrent - void tagAdded(const QString &tag); - void tagRemoved(const QString &tag); - -+ public slots: -+ void processUnbanRequest(); -+ - private slots: - void configureDeferred(); - void readAlerts(); -@@ -601,6 +623,8 @@ namespace BitTorrent - void populateAdditionalTrackers(); - void enableIPFilter(); - void disableIPFilter(); -+ int parseOfflineFilterFile(QString ipDat, libtorrent::ip_filter &filter); -+ void loadOfflineFilter(); - - bool addTorrent_impl(CreateTorrentParams params, const MagnetUri &magnetUri, - TorrentInfo torrentInfo = TorrentInfo(), -@@ -713,6 +737,8 @@ namespace BitTorrent - CachedSettingValue m_isAltGlobalSpeedLimitEnabled; - CachedSettingValue m_isBandwidthSchedulerEnabled; - CachedSettingValue m_saveResumeDataInterval; -+ CachedSettingValue m_autoBanUnknownPeer; -+ CachedSettingValue m_showTrackerAuthWindow; - CachedSettingValue m_port; - CachedSettingValue m_useRandomPort; - CachedSettingValue m_networkInterface; ---- a/src/base/bittorrent/torrenthandle.cpp -+++ b/src/base/bittorrent/torrenthandle.cpp -@@ -1561,7 +1561,8 @@ void TorrentHandle::handleTrackerErrorAl - m_trackerInfos[trackerUrl].lastMessage = message; - - if (p->status_code == 401) -- m_session->handleTorrentTrackerAuthenticationRequired(this, trackerUrl); -+ if (Preferences::instance()->getShowTrackerAuthWindow()) -+ m_session->handleTorrentTrackerAuthenticationRequired(this, trackerUrl); - - m_session->handleTorrentTrackerError(this, trackerUrl); - } ---- a/src/base/preferences.cpp -+++ b/src/base/preferences.cpp -@@ -1090,6 +1090,26 @@ void Preferences::setTrayIconStyle(TrayI - } - #endif - -+bool Preferences::getAutoBanUnknownPeer() const -+{ -+ return value("Preferences/Advanced/AutoBanUnknownPeer", false).toBool(); -+} -+ -+void Preferences::setAutoBanUnknownPeer(const bool checked) -+{ -+ setValue("Preferences/Advanced/AutoBanUnknownPeer", checked); -+} -+ -+bool Preferences::getShowTrackerAuthWindow() const -+{ -+ return value("Preferences/Advanced/ShowTrackerAuthWindow", true).toBool(); -+} -+ -+void Preferences::setShowTrackerAuthWindow(const bool checked) -+{ -+ setValue("Preferences/Advanced/ShowTrackerAuthWindow", checked); -+} -+ - // Stuff that don't appear in the Options GUI but are saved - // in the same file. - ---- a/src/base/preferences.h -+++ b/src/base/preferences.h -@@ -300,6 +300,10 @@ public: - TrayIcon::Style trayIconStyle() const; - void setTrayIconStyle(TrayIcon::Style style); - #endif // Q_OS_MAC -+ bool getAutoBanUnknownPeer() const; -+ void setAutoBanUnknownPeer(const bool checked); -+ bool getShowTrackerAuthWindow() const; -+ void setShowTrackerAuthWindow(const bool checked); - - // Stuff that don't appear in the Options GUI but are saved - // in the same file. ---- a/src/base/settingsstorage.cpp -+++ b/src/base/settingsstorage.cpp -@@ -91,6 +91,8 @@ namespace - {"BitTorrent/Session/InterfaceName", "Preferences/Connection/InterfaceName"}, - {"BitTorrent/Session/InterfaceAddress", "Preferences/Connection/InterfaceAddress"}, - {"BitTorrent/Session/SaveResumeDataInterval", "Preferences/Downloads/SaveResumeDataInterval"}, -+ {"BitTorrent/Session/AutoBanUnknownPeer", "Preferences/Advanced/AutoBanUnknownPeer"}, -+ {"BitTorrent/Session/ShowTrackerAuthWindow", "Preferences/Advanced/ShowTrackerAuthWindow"}, - {"BitTorrent/Session/Encryption", "Preferences/Bittorrent/Encryption"}, - {"BitTorrent/Session/ForceProxy", "Preferences/Connection/ProxyForce"}, - {"BitTorrent/Session/ProxyPeerConnections", "Preferences/Connection/ProxyPeerConnections"}, ---- a/src/gui/advancedsettings.cpp -+++ b/src/gui/advancedsettings.cpp -@@ -60,6 +60,8 @@ enum AdvSettingsRows - NETWORK_LISTEN_IPV6, - // behavior - SAVE_RESUME_DATA_INTERVAL, -+ CONFIRM_AUTO_BAN, -+ SHOW_TRACKER_AUTH_WINDOW, - CONFIRM_RECHECK_TORRENT, - RECHECK_COMPLETED, - #if defined(Q_OS_WIN) || defined(Q_OS_MAC) -@@ -215,6 +217,10 @@ void AdvancedSettings::saveAdvancedSetti - // Announce IP - QHostAddress addr(lineEditAnnounceIP.text().trimmed()); - session->setAnnounceIP(addr.isNull() ? "" : addr.toString()); -+ // Auto ban Unknown Peer -+ session->setAutoBanUnknownPeer(cb_auto_ban_unknown_peer.isChecked()); -+ // Show Tracker Authenticaion Window -+ session->setShowTrackerAuthWindow(cb_show_tracker_auth_window.isChecked()); - - // Program notification - MainWindow *const mainWindow = static_cast(QCoreApplication::instance())->mainWindow(); -@@ -465,6 +471,12 @@ void AdvancedSettings::loadAdvancedSetti - // Announce IP - lineEditAnnounceIP.setText(session->announceIP()); - addRow(ANNOUNCE_IP, tr("IP Address to report to trackers (requires restart)"), &lineEditAnnounceIP); -+ // Auto Ban Unknown Peer from China -+ cb_auto_ban_unknown_peer.setChecked(session->isAutoBanUnknownPeerEnabled()); -+ addRow(CONFIRM_AUTO_BAN, tr("Auto Ban Unknown Peer from China"), &cb_auto_ban_unknown_peer); -+ // Show Tracker Authenticaion Window -+ cb_show_tracker_auth_window.setChecked(session->isShowTrackerAuthWindow()); -+ addRow(SHOW_TRACKER_AUTH_WINDOW, tr("Show Tracker Authenticaion Window"), &cb_show_tracker_auth_window); - - // Program notifications - const MainWindow *const mainWindow = static_cast(QCoreApplication::instance())->mainWindow(); ---- a/src/gui/advancedsettings.h -+++ b/src/gui/advancedsettings.h -@@ -65,7 +65,8 @@ private: - QCheckBox checkBoxOsCache, checkBoxRecheckCompleted, checkBoxResolveCountries, checkBoxResolveHosts, checkBoxSuperSeeding, - checkBoxProgramNotifications, checkBoxTorrentAddedNotifications, checkBoxTrackerFavicon, checkBoxTrackerStatus, - checkBoxConfirmTorrentRecheck, checkBoxConfirmRemoveAllTags, checkBoxListenIPv6, checkBoxAnnounceAllTrackers, checkBoxAnnounceAllTiers, -- checkBoxGuidedReadCache, checkBoxMultiConnectionsPerIp, checkBoxSuggestMode, checkBoxCoalesceRW, checkBoxSpeedWidgetEnabled; -+ checkBoxGuidedReadCache, checkBoxMultiConnectionsPerIp, checkBoxSuggestMode, checkBoxCoalesceRW, checkBoxSpeedWidgetEnabled, -+ cb_auto_ban_unknown_peer, cb_show_tracker_auth_window; - QComboBox comboBoxInterface, comboBoxInterfaceAddress, comboBoxUtpMixedMode, comboBoxChokingAlgorithm, comboBoxSeedChokingAlgorithm; - QLineEdit lineEditAnnounceIP; - ---- a/src/gui/mainwindow.cpp -+++ b/src/gui/mainwindow.cpp -@@ -73,6 +73,7 @@ - #include "addnewtorrentdialog.h" - #include "application.h" - #include "autoexpandabledialog.h" -+#include "base/bittorrent/peerinfo.h" - #include "cookiesdialog.h" - #include "downloadfromurldialog.h" - #include "executionlogwidget.h" ---- a/src/gui/properties/peerlistdelegate.h -+++ b/src/gui/properties/peerlistdelegate.h -@@ -49,6 +49,7 @@ public: - CONNECTION, - FLAGS, - CLIENT, -+ PEERID, - PROGRESS, - DOWN_SPEED, - UP_SPEED, ---- a/src/gui/properties/peerlistwidget.cpp -+++ b/src/gui/properties/peerlistwidget.cpp -@@ -75,6 +75,7 @@ PeerListWidget::PeerListWidget(Propertie - m_listModel->setHeaderData(PeerListDelegate::FLAGS, Qt::Horizontal, tr("Flags")); - m_listModel->setHeaderData(PeerListDelegate::CONNECTION, Qt::Horizontal, tr("Connection")); - m_listModel->setHeaderData(PeerListDelegate::CLIENT, Qt::Horizontal, tr("Client", "i.e.: Client application")); -+ m_listModel->setHeaderData(PeerListDelegate::PEERID, Qt::Horizontal, tr("Peer ID", "i.e.: Client Peer ID")); - m_listModel->setHeaderData(PeerListDelegate::PROGRESS, Qt::Horizontal, tr("Progress", "i.e: % downloaded")); - m_listModel->setHeaderData(PeerListDelegate::DOWN_SPEED, Qt::Horizontal, tr("Down Speed", "i.e: Download speed")); - m_listModel->setHeaderData(PeerListDelegate::UP_SPEED, Qt::Horizontal, tr("Up Speed", "i.e: Upload speed")); -@@ -288,8 +289,13 @@ void PeerListWidget::banSelectedPeers() - for (const QModelIndex &index : selectedIndexes) { - int row = m_proxyModel->mapToSource(index).row(); - QString ip = m_listModel->data(m_listModel->index(row, PeerListDelegate::IP_HIDDEN)).toString(); -+ QString client = m_listModel->data(m_listModel->index(row, PeerListDelegate::CLIENT)).toString(); -+ QString peerid = m_listModel->data(m_listModel->index(row, PeerListDelegate::PEERID)).toString(); -+ QHostAddress host; -+ host.setAddress(ip); -+ const QString countryName = Net::GeoIPManager::CountryName(Net::GeoIPManager::instance()->lookup(host)); - qDebug("Banning peer %s...", ip.toLocal8Bit().data()); -- Logger::instance()->addMessage(tr("Manually banning peer '%1'...").arg(ip)); -+ Logger::instance()->addMessage(tr("Manually banning peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(peerid).arg(client).arg(countryName)); - BitTorrent::Session::instance()->banIP(ip); - } - // Refresh list -@@ -398,6 +404,7 @@ QStandardItem *PeerListWidget::addPeer(c - m_listModel->setData(m_listModel->index(row, PeerListDelegate::FLAGS), peer.flags()); - m_listModel->setData(m_listModel->index(row, PeerListDelegate::FLAGS), peer.flagsDescription(), Qt::ToolTipRole); - m_listModel->setData(m_listModel->index(row, PeerListDelegate::CLIENT), peer.client().toHtmlEscaped()); -+ m_listModel->setData(m_listModel->index(row, PeerListDelegate::PEERID), peer.pid().left(8).toHtmlEscaped()); - m_listModel->setData(m_listModel->index(row, PeerListDelegate::PROGRESS), peer.progress()); - m_listModel->setData(m_listModel->index(row, PeerListDelegate::DOWN_SPEED), peer.payloadDownSpeed()); - m_listModel->setData(m_listModel->index(row, PeerListDelegate::UP_SPEED), peer.payloadUpSpeed()); -@@ -429,6 +436,7 @@ void PeerListWidget::updatePeer(const QS - m_listModel->setData(m_listModel->index(row, PeerListDelegate::FLAGS), peer.flags()); - m_listModel->setData(m_listModel->index(row, PeerListDelegate::FLAGS), peer.flagsDescription(), Qt::ToolTipRole); - m_listModel->setData(m_listModel->index(row, PeerListDelegate::CLIENT), peer.client().toHtmlEscaped()); -+ m_listModel->setData(m_listModel->index(row, PeerListDelegate::PEERID), peer.pid().left(8).toHtmlEscaped()); - m_listModel->setData(m_listModel->index(row, PeerListDelegate::PROGRESS), peer.progress()); - m_listModel->setData(m_listModel->index(row, PeerListDelegate::DOWN_SPEED), peer.payloadDownSpeed()); - m_listModel->setData(m_listModel->index(row, PeerListDelegate::UP_SPEED), peer.payloadUpSpeed()); ---- a/src/webui/api/appcontroller.cpp -+++ b/src/webui/api/appcontroller.cpp -@@ -153,6 +153,7 @@ void AppController::preferencesAction() - data["ip_filter_path"] = Utils::Fs::toNativePath(session->IPFilterFile()); - data["ip_filter_trackers"] = session->isTrackerFilteringEnabled(); - data["banned_IPs"] = session->bannedIPs().join("\n"); -+ data["auto_ban_unknown_peer"] = session->isAutoBanUnknownPeerEnabled(); - - // Speed - // Global Rate Limits -@@ -401,6 +402,8 @@ void AppController::setPreferencesAction - session->setTrackerFilteringEnabled(m["ip_filter_trackers"].toBool()); - if (m.contains("banned_IPs")) - session->setBannedIPs(m["banned_IPs"].toString().split('\n')); -+ if (m.contains("auto_ban_unknown_peer")) -+ session->setAutoBanUnknownPeer(m["auto_ban_unknown_peer"].toBool()); - - // Speed - // Global Rate Limits ---- a/src/webui/api/transfercontroller.cpp -+++ b/src/webui/api/transfercontroller.cpp -@@ -30,6 +30,7 @@ - - #include - -+#include "base/logger.h" - #include "base/bittorrent/session.h" - - const char KEY_TRANSFER_DLSPEED[] = "dl_info_speed"; -@@ -111,3 +112,37 @@ void TransferController::speedLimitsMode - { - setResult(QString::number(BitTorrent::Session::instance()->isAltGlobalSpeedLimitEnabled())); - } -+ -+void TransferController::tempblockPeerAction() -+{ -+ checkParams({"ip"}); -+ QString ip = params()["ip"]; -+ boost::system::error_code ec; -+ boost::asio::ip::address addr = boost::asio::ip::address::from_string(ip.toStdString(), ec); -+ bool isBanned = BitTorrent::Session::instance()->checkAccessFlags(QString::fromStdString(addr.to_string())); -+ -+ if (ip.isEmpty()) { -+ setResult(QLatin1String("IP field should not be empty.")); -+ return; -+ } -+ -+ if (ec) { -+ setResult(QLatin1String("The given IP address is not valid.")); -+ return; -+ } -+ -+ if (isBanned) { -+ setResult(QLatin1String("The given IP address already exists.")); -+ return; -+ } -+ -+ BitTorrent::Session::instance()->tempblockIP(ip); -+ Logger::instance()->addMessage(tr("Peer '%1' banned via Web API.").arg(ip)); -+ setResult(QLatin1String("Done.")); -+} -+ -+void TransferController::resetIPFilterAction() -+{ -+ BitTorrent::Session::instance()->eraseIPFilter(); -+ setResult(QLatin1String("Erased.")); -+} ---- a/src/webui/api/transfercontroller.h -+++ b/src/webui/api/transfercontroller.h -@@ -46,4 +46,6 @@ private slots: - void downloadLimitAction(); - void setUploadLimitAction(); - void setDownloadLimitAction(); -+ void tempblockPeerAction(); -+ void resetIPFilterAction(); - }; ---- a/src/webui/www/private/preferences_content.html -+++ b/src/webui/www/private/preferences_content.html -@@ -377,6 +377,8 @@ - - - -+ -+ - - - -@@ -1252,6 +1254,7 @@ - $('ipfilter_text').setProperty('value', pref.ip_filter_path); - $('ipfilter_trackers_checkbox').setProperty('checked', pref.ip_filter_trackers); - $('banned_IPs_textarea').setProperty('value', pref.banned_IPs); -+ $('auto_ban_unknown_peer_checkbox').setProperty('checked', pref.auto_ban_unknown_peer); - updateFilterSettings(); - - // Speed tab -@@ -1502,6 +1505,7 @@ - settings.set('ip_filter_path', $('ipfilter_text').getProperty('value')); - settings.set('ip_filter_trackers', $('ipfilter_trackers_checkbox').getProperty('checked')); - settings.set('banned_IPs', $('banned_IPs_textarea').getProperty('value')); -+ settings.set('auto_ban_unknown_peer', $('auto_ban_unknown_peer_checkbox').getProperty('checked')); - - // Speed tab - // Global Rate Limits diff --git a/package/lean/qt5/Makefile b/package/lean/qt5/Makefile index 8d51639e12..c2c4eff36b 100644 --- a/package/lean/qt5/Makefile +++ b/package/lean/qt5/Makefile @@ -11,17 +11,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qt5 -PKG_VERSION:=5.9.8 -PKG_RELEASE:=1 +PKG_VERSION:=5.13 +PKG_RELEASE:=2 -PKG_SOURCE:=qt-everywhere-opensource-src-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=http://download.qt-project.org/archive/qt/5.9/$(PKG_VERSION)/single -PKG_HASH:=86aca7dc37f161fc730a9d4f6bddf684962ca560327682e282ff61bf8b859c36 +PKG_SOURCE:=qt-everywhere-src-$(PKG_VERSION).$(PKG_RELEASE).tar.xz +PKG_SOURCE_URL:=http://download.qt-project.org/archive/qt/$(PKG_VERSION)/$(PKG_VERSION).$(PKG_RELEASE)/single/ +PKG_HASH:=55e8273536be41f4f63064a79e552a22133848bb419400b6fa8e9fc0dc05de08 PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 -PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-opensource-src-$(PKG_VERSION) +PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-src-$(PKG_VERSION).$(PKG_RELEASE) include $(INCLUDE_DIR)/package.mk @@ -47,7 +47,7 @@ endef define Package/qt5-core $(call Package/qt5/Default) TITLE+=core - DEPENDS+=+libatomic +zlib +libpcre2-16 +libdouble-conversion + DEPENDS+=+libatomic +libzstd +zlib +libpcre2-16 +libdouble-conversion +icu endef define Package/qt5-network @@ -64,27 +64,19 @@ endef CONFIGURE_ARGS = \ -prefix /usr \ + -extprefix $(TOOLCHAIN_DIR) \ -sysroot $(STAGING_DIR) \ -plugindir /usr/lib/Qt/plugins \ -R /usr/lib \ -I $(STAGING_DIR)/usr/include \ -L $(STAGING_DIR)/usr/lib \ -xplatform linux-openwrt-g++ \ - -release \ - -shared \ -opensource \ -confirm-license \ - -no-use-gold-linker \ - -strip \ - -ltcg \ - -optimized-qmake \ -system-doubleconversion \ - -no-glib \ - -no-icu \ -system-pcre \ -system-zlib \ - -no-slog2 \ - -openssl-linked \ + -openssl-runtime \ -no-cups \ -no-freetype \ -no-harfbuzz \ @@ -93,18 +85,16 @@ CONFIGURE_ARGS = \ -no-opengles3 \ -no-angle \ -no-openvg \ + -no-dbus \ -no-directfb \ -no-eglfs \ - -no-egl \ + -no-feature-getentropy \ -no-iconv \ - -no-gbm \ -no-kms \ - -no-xcb \ -no-pch \ -no-libudev \ -no-mtdev \ -no-tslib \ - -no-xkbcommon-evdev \ -no-libpng \ -no-libjpeg \ -no-sql-db2 \ @@ -117,53 +107,41 @@ CONFIGURE_ARGS = \ -no-sql-sqlite2 \ -no-sqlite \ -no-sql-tds \ + -no-strip \ + -no-xcb \ -no-gui \ -no-widgets \ - -no-dbus \ - -no-qml-debug \ + -no-glib \ -make libs \ -nomake examples \ -nomake tests \ -nomake tools \ - -no-compile-examples \ - -skip qt3d \ - -skip qtactiveqt \ - -skip qtandroidextras \ - -skip qtcanvas3d \ - -skip qtcharts \ - -skip qtconnectivity \ - -skip qtdatavis3d \ - -skip qtdeclarative \ - -skip qtdoc \ - -skip qtgamepad \ - -skip qtgraphicaleffects \ - -skip qtimageformats \ - -skip qtlocation \ - -skip qtmacextras \ - -skip qtmultimedia \ - -skip qtnetworkauth \ - -skip qtpurchasing \ - -skip qtquickcontrols \ - -skip qtquickcontrols2 \ - -skip qtremoteobjects \ - -skip qtscript \ - -skip qtscxml \ - -skip qtsensors \ - -skip qtserialbus \ - -skip qtserialport \ - -skip qtspeech \ - -skip qtsvg \ - -skip qttranslations \ - -skip qtvirtualkeyboard \ - -skip qtwayland \ - -skip qtwebchannel \ - -skip qtwebengine \ - -skip qtwebsockets \ - -skip qtwebview \ - -skip qtwinextras \ - -skip qtx11extras \ - -skip qtxmlpatterns \ - -v + -skip 3d \ + -skip activeqt \ + -skip charts \ + -skip connectivity \ + -skip datavis3d \ + -skip declarative \ + -skip doc \ + -skip gamepad \ + -skip imageformats \ + -skip location \ + -skip networkauth \ + -skip multimedia \ + -skip purchasing \ + -skip remoteobjects \ + -skip script \ + -skip sensors \ + -skip serialbus \ + -skip serialport \ + -skip speech \ + -skip svg \ + -skip wayland \ + -skip webengine \ + -skip websockets \ + -skip webchannel \ + -skip xmlpatterns \ + -v \ define Build/Configure $(SED) 's@$$$$(TARGET_CROSS)@$(TARGET_CROSS)@g' $(PKG_BUILD_DIR)/qtbase/mkspecs/linux-openwrt-g++/qmake.conf diff --git a/package/lean/qt5/patches/001-fix-symbol-resolving-for-OPENSSL_NO_NEXPROTONEG.patch b/package/lean/qt5/patches/001-fix-symbol-resolving-for-OPENSSL_NO_NEXPROTONEG.patch new file mode 100644 index 0000000000..4056d2885d --- /dev/null +++ b/package/lean/qt5/patches/001-fix-symbol-resolving-for-OPENSSL_NO_NEXPROTONEG.patch @@ -0,0 +1,19 @@ +--- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp 2019-10-25 15:16:48.000000000 +0800 ++++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp 2020-02-06 23:29:33.072453568 +0800 +@@ -1376,12 +1376,12 @@ + RESOLVEFUNC(SSL_select_next_proto) + RESOLVEFUNC(SSL_CTX_set_next_proto_select_cb) + RESOLVEFUNC(SSL_get0_next_proto_negotiated) +-#endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... + #if OPENSSL_VERSION_NUMBER >= 0x10002000L +- RESOLVEFUNC(SSL_set_alpn_protos) +- RESOLVEFUNC(SSL_CTX_set_alpn_select_cb) +- RESOLVEFUNC(SSL_get0_alpn_selected) ++ RESOLVEFUNC(SSL_set_alpn_protos) ++ RESOLVEFUNC(SSL_CTX_set_alpn_select_cb) ++ RESOLVEFUNC(SSL_get0_alpn_selected) + #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L ... ++#endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... + #if QT_CONFIG(dtls) + RESOLVEFUNC(SSL_CTX_set_cookie_generate_cb) + RESOLVEFUNC(SSL_CTX_set_cookie_verify_cb) diff --git a/package/lean/qt5/patches/010-pre_3.6_kernels_fix.patch b/package/lean/qt5/patches/010-pre_3.6_kernels_fix.patch deleted file mode 100644 index 818e4efcdd..0000000000 --- a/package/lean/qt5/patches/010-pre_3.6_kernels_fix.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- a/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp -+++ b/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp -@@ -33,7 +33,6 @@ - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ -- - #include "socketcanbackend.h" - - #include -@@ -50,29 +49,7 @@ - #include - #include - --#ifndef CANFD_MTU --// CAN FD support was added by Linux kernel 3.6 --// For prior kernels we redefine the missing defines here --// they are taken from linux/can/raw.h & linux/can.h -- --enum { -- CAN_RAW_FD_FRAMES = 5 --}; -- --#define CAN_MAX_DLEN 8 --#define CANFD_MAX_DLEN 64 --struct canfd_frame { -- canid_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */ -- __u8 len; /* frame payload length in byte */ -- __u8 flags; /* additional flags for CAN FD */ -- __u8 __res0; /* reserved / padding */ -- __u8 __res1; /* reserved / padding */ -- __u8 data[CANFD_MAX_DLEN] __attribute__((aligned(8))); --}; --#define CAN_MTU (sizeof(struct can_frame)) --#define CANFD_MTU (sizeof(struct canfd_frame)) - --#endif - - #ifndef CANFD_BRS - # define CANFD_BRS 0x01 /* bit rate switch (second bitrate for payload data) */ ---- a/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.h -+++ b/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.h -@@ -45,6 +45,31 @@ - #include - #include - -+#ifndef CANFD_MTU -+// CAN FD support was added by Linux kernel 3.6 -+// For prior kernels we redefine the missing defines here -+// they are taken from linux/can/raw.h & linux/can.h -+ -+enum { -+ CAN_RAW_FD_FRAMES = 5 -+}; -+ -+#define CAN_MAX_DLEN 8 -+#define CANFD_MAX_DLEN 64 -+struct canfd_frame { -+ canid_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */ -+ __u8 len; /* frame payload length in byte */ -+ __u8 flags; /* additional flags for CAN FD */ -+ __u8 __res0; /* reserved / padding */ -+ __u8 __res1; /* reserved / padding */ -+ __u8 data[CANFD_MAX_DLEN] __attribute__((aligned(8))); -+}; -+#define CAN_MTU (sizeof(struct can_frame)) -+#define CANFD_MTU (sizeof(struct canfd_frame)) -+ -+#endif -+ -+ - QT_BEGIN_NAMESPACE - - class SocketCanBackend : public QCanBusDevice diff --git a/package/lean/qt5/patches/020-disable_unused_libs.patch b/package/lean/qt5/patches/020-disable_unused_libs.patch deleted file mode 100644 index e32bae7647..0000000000 --- a/package/lean/qt5/patches/020-disable_unused_libs.patch +++ /dev/null @@ -1,91 +0,0 @@ -This patch disables prinstsupport, sql, concurrent, testlib base libs compilation ---- a/qtbase/src/src.pro -+++ b/qtbase/src/src.pro -@@ -66,22 +66,10 @@ src_dbus.target = sub-dbus - src_dbus.depends = src_corelib - force_dbus_bootstrap: src_dbus.depends += src_tools_bootstrap_dbus # avoid syncqt race - --src_concurrent.subdir = $$PWD/concurrent --src_concurrent.target = sub-concurrent --src_concurrent.depends = src_corelib -- --src_sql.subdir = $$PWD/sql --src_sql.target = sub-sql --src_sql.depends = src_corelib -- - src_network.subdir = $$PWD/network - src_network.target = sub-network - src_network.depends = src_corelib - --src_testlib.subdir = $$PWD/testlib --src_testlib.target = sub-testlib --src_testlib.depends = src_corelib # testlib links only to corelib, but see below for the headers -- - src_3rdparty_pcre2.subdir = $$PWD/3rdparty/pcre2 - src_3rdparty_pcre2.target = sub-3rdparty-pcre2 - -@@ -125,13 +113,6 @@ src_openglextensions.subdir = $$PWD/open - src_openglextensions.target = sub-openglextensions - src_openglextensions.depends = src_gui - --src_printsupport.subdir = $$PWD/printsupport --src_printsupport.target = sub-printsupport --src_printsupport.depends = src_corelib src_gui src_widgets src_tools_uic -- --src_plugins.subdir = $$PWD/plugins --src_plugins.target = sub-plugins -- - src_android.subdir = $$PWD/android - - # this order is important -@@ -152,14 +133,8 @@ TOOLS = src_tools_moc src_tools_rcc src_ - win32:SUBDIRS += src_winmain - qtConfig(network) { - SUBDIRS += src_network -- src_plugins.depends += src_network --} --qtConfig(sql) { -- SUBDIRS += src_sql -- src_plugins.depends += src_sql - } - qtConfig(xml): SUBDIRS += src_xml --qtConfig(testlib): SUBDIRS += src_testlib - qtConfig(dbus) { - force_dbus_bootstrap|qtConfig(private_tests): \ - SUBDIRS += src_tools_bootstrap_dbus -@@ -167,9 +142,7 @@ qtConfig(dbus) { - TOOLS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml - qtConfig(accessibility-atspi-bridge): \ - src_platformsupport.depends += src_dbus src_tools_qdbusxml2cpp -- src_plugins.depends += src_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml - } --qtConfig(concurrent): SUBDIRS += src_concurrent - qtConfig(gui) { - qtConfig(harfbuzz):!qtConfig(system-harfbuzz) { - SUBDIRS += src_3rdparty_harfbuzzng -@@ -190,24 +163,17 @@ qtConfig(gui) { - } - SUBDIRS += src_gui src_platformsupport src_platformheaders - qtConfig(opengl): SUBDIRS += src_openglextensions -- src_plugins.depends += src_gui src_platformsupport src_platformheaders -- src_testlib.depends += src_gui # if QtGui is enabled, QtTest requires QtGui's headers - qtConfig(widgets) { - SUBDIRS += src_tools_uic src_widgets - !android-embedded: SUBDIRS += src_printsupport - TOOLS += src_tools_uic -- src_plugins.depends += src_widgets -- !android-embedded: src_plugins.depends += src_printsupport -- src_testlib.depends += src_widgets # if QtWidgets is enabled, QtTest requires QtWidgets's headers - qtConfig(opengl) { - SUBDIRS += src_opengl -- src_plugins.depends += src_opengl - } - } - } --SUBDIRS += src_plugins - --nacl: SUBDIRS -= src_network src_testlib -+nacl: SUBDIRS -= src_network - - android:!android-embedded: SUBDIRS += src_android src_3rdparty_gradle - diff --git a/package/lean/qt5/patches/030-qtbase-fix-compile-with-openssl1.1.1.patch b/package/lean/qt5/patches/030-qtbase-fix-compile-with-openssl1.1.1.patch deleted file mode 100644 index b68ac8e335..0000000000 --- a/package/lean/qt5/patches/030-qtbase-fix-compile-with-openssl1.1.1.patch +++ /dev/null @@ -1,3985 +0,0 @@ -commit 2d88fc0ce4ac76924a65ffd797183de9422ba672 -Author: Andreas Rammhold -Date: Wed Mar 6 00:18:51 2019 +0100 - - openssl1.1 compat - -diff --git a/qtbase/config.tests/openssl/openssl.cpp b/qtbase/config.tests/openssl/openssl.cpp -index 6c8a9e8f19..d33b62389c 100644 ---- a/qtbase/config.tests/openssl/openssl.cpp -+++ b/qtbase/config.tests/openssl/openssl.cpp -@@ -39,8 +39,8 @@ - - #include - --#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10000000L || OPENSSL_VERSION_NUMBER-0 >= 0x10100000L --# error "OpenSSL >= 1.0.0, and < 1.1.0 is required" -+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10000000L -+# error "OpenSSL >= 1.0.0 is required" - #endif - - #include -diff --git a/qtbase/config.tests/openssl11/openssl.cpp b/qtbase/config.tests/openssl11/openssl.cpp -new file mode 100644 -index 0000000000..c20cc59deb ---- /dev/null -+++ b/qtbase/config.tests/openssl11/openssl.cpp -@@ -0,0 +1,48 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2017 The Qt Company Ltd. -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the config.tests of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#include -+ -+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L -+# error "OpenSSL >= 1.1 is required" -+#endif -+ -+int main() -+{ -+} -diff --git a/qtbase/config.tests/openssl11/openssl11.pro b/qtbase/config.tests/openssl11/openssl11.pro -new file mode 100644 -index 0000000000..a023aee4aa ---- /dev/null -+++ b/qtbase/config.tests/openssl11/openssl11.pro -@@ -0,0 +1,2 @@ -+SOURCES = openssl.cpp -+CONFIG -= x11 qt -diff --git a/qtbase/src/network/configure.json b/qtbase/src/network/configure.json -index 2cf90ed94b..a021c0734b 100644 ---- a/qtbase/src/network/configure.json -+++ b/qtbase/src/network/configure.json -@@ -77,6 +77,17 @@ - }, - { "libs": "-lssl -lcrypto", "condition": "!config.win32" } - ] -+ }, -+ "openssl11": { -+ "label": "OpenSSL v. 1.1 support", -+ "type": "compile", -+ "test": "openssl11", -+ "sources": [ -+ { -+ "comment": "placeholder for OPENSSL_PATH", -+ "libs": "" -+ } -+ ] - } - }, - -@@ -182,7 +193,7 @@ - "enable": "input.openssl == 'yes' || input.openssl == 'linked' || input.openssl == 'runtime'", - "disable": "input.openssl == 'no' || input.ssl == 'no'", - "autoDetect": "!config.winrt", -- "condition": "!features.securetransport && (features.openssl-linked || libs.openssl_headers)", -+ "condition": "!features.securetransport && (features.openssl-linked || libs.openssl_headers || feature.opensslv11)", - "output": [ - "privateFeature", - { "type": "publicQtConfig", "condition": "!features.openssl-linked" }, -@@ -193,7 +204,7 @@ - "label": " Qt directly linked to OpenSSL", - "enable": "input.openssl == 'linked'", - "disable": "input.openssl != 'linked'", -- "condition": "!features.securetransport && libs.openssl", -+ "condition": "!features.securetransport && (libs.openssl || feature.opensslv11)", - "output": [ - "privateFeature", - { "type": "define", "name": "QT_LINKED_OPENSSL" } -@@ -213,6 +224,11 @@ - "condition": "config.winrt || features.securetransport || features.openssl", - "output": [ "publicFeature", "feature" ] - }, -+ "opensslv11": { -+ "label": "OpenSSL v. 1.1", -+ "condition": "libs.openssl11", -+ "output": ["publicFeature", "feature"] -+ }, - "sctp": { - "label": "SCTP", - "autoDetect": false, -diff --git a/qtbase/src/network/ssl/qsslcertificate_openssl.cpp b/qtbase/src/network/ssl/qsslcertificate_openssl.cpp -index 28b7eda54a..71e514a025 100644 ---- a/qtbase/src/network/ssl/qsslcertificate_openssl.cpp -+++ b/qtbase/src/network/ssl/qsslcertificate_openssl.cpp -@@ -1,6 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. -+** Copyright (C) 2017 The Qt Company Ltd. -+** Copyright (C) 2016 Richard J. Moore - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtNetwork module of the Qt Toolkit. -@@ -64,12 +65,14 @@ bool QSslCertificate::operator==(const QSslCertificate &other) const - uint qHash(const QSslCertificate &key, uint seed) Q_DECL_NOTHROW - { - if (X509 * const x509 = key.d->x509) { -- (void)q_X509_cmp(x509, x509); // populate x509->sha1_hash -- // (if someone knows a better way...) -- return qHashBits(x509->sha1_hash, SHA_DIGEST_LENGTH, seed); -- } else { -- return seed; -+ const EVP_MD *sha1 = q_EVP_sha1(); -+ unsigned int len = 0; -+ unsigned char md[EVP_MAX_MD_SIZE]; -+ q_X509_digest(x509, sha1, md, &len); -+ return qHashBits(md, len, seed); - } -+ -+ return seed; - } - - bool QSslCertificate::isNull() const -@@ -89,8 +92,7 @@ QByteArray QSslCertificate::version() const - { - QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); - if (d->versionString.isEmpty() && d->x509) -- d->versionString = -- QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x509->cert_info->version)) + 1); -+ d->versionString = QByteArray::number(qlonglong(q_X509_get_version(d->x509)) + 1); - - return d->versionString; - } -@@ -99,7 +101,7 @@ QByteArray QSslCertificate::serialNumber() const - { - QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); - if (d->serialNumberString.isEmpty() && d->x509) { -- ASN1_INTEGER *serialNumber = d->x509->cert_info->serialNumber; -+ ASN1_INTEGER *serialNumber = q_X509_get_serialNumber(d->x509); - QByteArray hexString; - hexString.reserve(serialNumber->length * 3); - for (int a = 0; a < serialNumber->length; ++a) { -@@ -199,14 +201,15 @@ QMultiMap QSslCertificate::subjectAlter - continue; - } - -- const char *altNameStr = reinterpret_cast(q_ASN1_STRING_data(genName->d.ia5)); -+ const char *altNameStr = reinterpret_cast(q_ASN1_STRING_get0_data(genName->d.ia5)); - const QString altName = QString::fromLatin1(altNameStr, len); - if (genName->type == GEN_DNS) - result.insert(QSsl::DnsEntry, altName); - else if (genName->type == GEN_EMAIL) - result.insert(QSsl::EmailEntry, altName); - } -- q_sk_pop_free((STACK*)altNames, reinterpret_cast(q_sk_free)); -+ -+ q_OPENSSL_sk_pop_free((OPENSSL_STACK*)altNames, reinterpret_cast(q_OPENSSL_sk_free)); - } - - return result; -@@ -235,25 +238,26 @@ QSslKey QSslCertificate::publicKey() const - QSslKey key; - - key.d->type = QSsl::PublicKey; -- X509_PUBKEY *xkey = d->x509->cert_info->key; -- EVP_PKEY *pkey = q_X509_PUBKEY_get(xkey); -+ -+ EVP_PKEY *pkey = q_X509_get_pubkey(d->x509); - Q_ASSERT(pkey); -+ const int keyType = q_EVP_PKEY_type(q_EVP_PKEY_base_id(pkey)); - -- if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_RSA) { -+ if (keyType == EVP_PKEY_RSA) { - key.d->rsa = q_EVP_PKEY_get1_RSA(pkey); - key.d->algorithm = QSsl::Rsa; - key.d->isNull = false; -- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA) { -+ } else if (keyType == EVP_PKEY_DSA) { - key.d->dsa = q_EVP_PKEY_get1_DSA(pkey); - key.d->algorithm = QSsl::Dsa; - key.d->isNull = false; - #ifndef OPENSSL_NO_EC -- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_EC) { -+ } else if (keyType == EVP_PKEY_EC) { - key.d->ec = q_EVP_PKEY_get1_EC_KEY(pkey); - key.d->algorithm = QSsl::Ec; - key.d->isNull = false; - #endif -- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DH) { -+ } else if (keyType == EVP_PKEY_DH) { - // DH unsupported - } else { - // error? -@@ -275,7 +279,7 @@ static QVariant x509UnknownExtensionToValue(X509_EXTENSION *ext) - X509V3_EXT_METHOD *meth = const_cast(q_X509V3_EXT_get(ext)); - if (!meth) { - ASN1_OCTET_STRING *value = q_X509_EXTENSION_get_data(ext); -- QByteArray result( reinterpret_cast(q_ASN1_STRING_data(value)), -+ QByteArray result( reinterpret_cast(q_ASN1_STRING_get0_data(value)), - q_ASN1_STRING_length(value)); - return result; - } -@@ -371,7 +375,7 @@ static QVariant x509ExtensionToValue(X509_EXTENSION *ext) - continue; - } - -- const char *uriStr = reinterpret_cast(q_ASN1_STRING_data(name->d.uniformResourceIdentifier)); -+ const char *uriStr = reinterpret_cast(q_ASN1_STRING_get0_data(name->d.uniformResourceIdentifier)); - const QString uri = QString::fromUtf8(uriStr, len); - - result[QString::fromUtf8(QSslCertificatePrivate::asn1ObjectName(ad->method))] = uri; -@@ -380,11 +384,7 @@ static QVariant x509ExtensionToValue(X509_EXTENSION *ext) - } - } - --#if OPENSSL_VERSION_NUMBER >= 0x10000000L -- q_sk_pop_free((_STACK*)info, reinterpret_cast(q_sk_free)); --#else -- q_sk_pop_free((STACK*)info, reinterpret_cast(q_sk_free)); --#endif -+ q_OPENSSL_sk_pop_free((OPENSSL_STACK*)info, reinterpret_cast(q_OPENSSL_sk_free)); - return result; - } - break; -@@ -607,7 +607,11 @@ static QMap _q_mapFromX509Name(X509_NAME *name) - unsigned char *data = 0; - int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e)); - info.insertMulti(name, QString::fromUtf8((char*)data, size)); -+#if QT_CONFIG(opensslv11) -+ q_CRYPTO_free(data, 0, 0); -+#else - q_CRYPTO_free(data); -+#endif - } - - return info; -@@ -619,8 +623,9 @@ QSslCertificate QSslCertificatePrivate::QSslCertificate_from_X509(X509 *x509) - if (!x509 || !QSslSocket::supportsSsl()) - return certificate; - -- ASN1_TIME *nbef = q_X509_get_notBefore(x509); -- ASN1_TIME *naft = q_X509_get_notAfter(x509); -+ ASN1_TIME *nbef = q_X509_getm_notBefore(x509); -+ ASN1_TIME *naft = q_X509_getm_notAfter(x509); -+ - certificate.d->notValidBefore = q_getTimeFromASN1(nbef); - certificate.d->notValidAfter = q_getTimeFromASN1(naft); - certificate.d->null = false; -diff --git a/qtbase/src/network/ssl/qsslcontext_openssl.cpp b/qtbase/src/network/ssl/qsslcontext_openssl.cpp -index c92d8fc3f8..cef503710c 100644 ---- a/qtbase/src/network/ssl/qsslcontext_openssl.cpp -+++ b/qtbase/src/network/ssl/qsslcontext_openssl.cpp -@@ -1,6 +1,6 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. -+** Copyright (C) 2017 The Qt Company Ltd. - ** Copyright (C) 2014 BlackBerry Limited. All rights reserved. - ** Copyright (C) 2014 Governikus GmbH & Co. KG. - ** Contact: https://www.qt.io/licensing/ -@@ -41,22 +41,14 @@ - - - #include --#include --#include - - #include "private/qssl_p.h" - #include "private/qsslcontext_openssl_p.h" --#include "private/qsslsocket_p.h" - #include "private/qsslsocket_openssl_p.h" - #include "private/qsslsocket_openssl_symbols_p.h" --#include "private/qssldiffiehellmanparameters_p.h" - - QT_BEGIN_NAMESPACE - --// defined in qsslsocket_openssl.cpp: --extern int q_X509Callback(int ok, X509_STORE_CTX *ctx); --extern QString getErrorsFromOpenSsl(); -- - QSslContext::QSslContext() - : ctx(0), - pkey(0), -@@ -78,301 +70,6 @@ QSslContext::~QSslContext() - q_SSL_SESSION_free(session); - } - --static inline QString msgErrorSettingEllipticCurves(const QString &why) --{ -- return QSslSocket::tr("Error when setting the elliptic curves (%1)").arg(why); --} -- --// static --void QSslContext::initSslContext(QSslContext *sslContext, QSslSocket::SslMode mode, const QSslConfiguration &configuration, bool allowRootCertOnDemandLoading) --{ -- sslContext->sslConfiguration = configuration; -- sslContext->errorCode = QSslError::NoError; -- -- bool client = (mode == QSslSocket::SslClientMode); -- -- bool reinitialized = false; -- bool unsupportedProtocol = false; --init_context: -- switch (sslContext->sslConfiguration.protocol()) { -- case QSsl::SslV2: --#ifndef OPENSSL_NO_SSL2 -- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv2_client_method() : q_SSLv2_server_method()); --#else -- // SSL 2 not supported by the system, but chosen deliberately -> error -- sslContext->ctx = 0; -- unsupportedProtocol = true; --#endif -- break; -- case QSsl::SslV3: --#ifndef OPENSSL_NO_SSL3_METHOD -- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); --#else -- // SSL 3 not supported by the system, but chosen deliberately -> error -- sslContext->ctx = 0; -- unsupportedProtocol = true; --#endif -- break; -- case QSsl::SecureProtocols: -- // SSLv2 and SSLv3 will be disabled by SSL options -- // But we need q_SSLv23_server_method() otherwise AnyProtocol will be unable to connect on Win32. -- case QSsl::TlsV1SslV3: -- // SSLv2 will will be disabled by SSL options -- case QSsl::AnyProtocol: -- default: -- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); -- break; -- case QSsl::TlsV1_0: -- sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method()); -- break; -- case QSsl::TlsV1_1: --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -- sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_1_client_method() : q_TLSv1_1_server_method()); --#else -- // TLS 1.1 not supported by the system, but chosen deliberately -> error -- sslContext->ctx = 0; -- unsupportedProtocol = true; --#endif -- break; -- case QSsl::TlsV1_2: --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -- sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_2_client_method() : q_TLSv1_2_server_method()); --#else -- // TLS 1.2 not supported by the system, but chosen deliberately -> error -- sslContext->ctx = 0; -- unsupportedProtocol = true; --#endif -- break; -- case QSsl::TlsV1_0OrLater: -- // Specific protocols will be specified via SSL options. -- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); -- break; -- case QSsl::TlsV1_1OrLater: -- case QSsl::TlsV1_2OrLater: --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -- // Specific protocols will be specified via SSL options. -- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); --#else -- // TLS 1.1/1.2 not supported by the system, but chosen deliberately -> error -- sslContext->ctx = 0; -- unsupportedProtocol = true; --#endif -- break; -- } -- -- if (!sslContext->ctx) { -- // After stopping Flash 10 the SSL library looses its ciphers. Try re-adding them -- // by re-initializing the library. -- if (!reinitialized) { -- reinitialized = true; -- if (q_SSL_library_init() == 1) -- goto init_context; -- } -- -- sslContext->errorStr = QSslSocket::tr("Error creating SSL context (%1)").arg( -- unsupportedProtocol ? QSslSocket::tr("unsupported protocol") : QSslSocketBackendPrivate::getErrorsFromOpenSsl() -- ); -- sslContext->errorCode = QSslError::UnspecifiedError; -- return; -- } -- -- // Enable bug workarounds. -- long options = QSslSocketBackendPrivate::setupOpenSslOptions(configuration.protocol(), configuration.d->sslOptions); -- q_SSL_CTX_set_options(sslContext->ctx, options); -- --#if OPENSSL_VERSION_NUMBER >= 0x10000000L -- // Tell OpenSSL to release memory early -- // http://www.openssl.org/docs/ssl/SSL_CTX_set_mode.html -- if (q_SSLeay() >= 0x10000000L) -- q_SSL_CTX_set_mode(sslContext->ctx, SSL_MODE_RELEASE_BUFFERS); --#endif -- -- // Initialize ciphers -- QByteArray cipherString; -- bool first = true; -- QList ciphers = sslContext->sslConfiguration.ciphers(); -- if (ciphers.isEmpty()) -- ciphers = QSslSocketPrivate::defaultCiphers(); -- for (const QSslCipher &cipher : qAsConst(ciphers)) { -- if (first) -- first = false; -- else -- cipherString.append(':'); -- cipherString.append(cipher.name().toLatin1()); -- } -- -- if (!q_SSL_CTX_set_cipher_list(sslContext->ctx, cipherString.data())) { -- sslContext->errorStr = QSslSocket::tr("Invalid or empty cipher list (%1)").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -- sslContext->errorCode = QSslError::UnspecifiedError; -- return; -- } -- -- const QDateTime now = QDateTime::currentDateTimeUtc(); -- -- // Add all our CAs to this store. -- const auto caCertificates = sslContext->sslConfiguration.caCertificates(); -- for (const QSslCertificate &caCertificate : caCertificates) { -- // From https://www.openssl.org/docs/ssl/SSL_CTX_load_verify_locations.html: -- // -- // If several CA certificates matching the name, key identifier, and -- // serial number condition are available, only the first one will be -- // examined. This may lead to unexpected results if the same CA -- // certificate is available with different expiration dates. If a -- // ``certificate expired'' verification error occurs, no other -- // certificate will be searched. Make sure to not have expired -- // certificates mixed with valid ones. -- // -- // See also: QSslSocketBackendPrivate::verify() -- if (caCertificate.expiryDate() >= now) { -- q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(sslContext->ctx), (X509 *)caCertificate.handle()); -- } -- } -- -- if (QSslSocketPrivate::s_loadRootCertsOnDemand && allowRootCertOnDemandLoading) { -- // tell OpenSSL the directories where to look up the root certs on demand -- const QList unixDirs = QSslSocketPrivate::unixRootCertDirectories(); -- for (const QByteArray &unixDir : unixDirs) -- q_SSL_CTX_load_verify_locations(sslContext->ctx, 0, unixDir.constData()); -- } -- -- if (!sslContext->sslConfiguration.localCertificate().isNull()) { -- // Require a private key as well. -- if (sslContext->sslConfiguration.privateKey().isNull()) { -- sslContext->errorStr = QSslSocket::tr("Cannot provide a certificate with no key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -- sslContext->errorCode = QSslError::UnspecifiedError; -- return; -- } -- -- // Load certificate -- if (!q_SSL_CTX_use_certificate(sslContext->ctx, (X509 *)sslContext->sslConfiguration.localCertificate().handle())) { -- sslContext->errorStr = QSslSocket::tr("Error loading local certificate, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -- sslContext->errorCode = QSslError::UnspecifiedError; -- return; -- } -- -- if (configuration.d->privateKey.algorithm() == QSsl::Opaque) { -- sslContext->pkey = reinterpret_cast(configuration.d->privateKey.handle()); -- } else { -- // Load private key -- sslContext->pkey = q_EVP_PKEY_new(); -- // before we were using EVP_PKEY_assign_R* functions and did not use EVP_PKEY_free. -- // this lead to a memory leak. Now we use the *_set1_* functions which do not -- // take ownership of the RSA/DSA key instance because the QSslKey already has ownership. -- if (configuration.d->privateKey.algorithm() == QSsl::Rsa) -- q_EVP_PKEY_set1_RSA(sslContext->pkey, reinterpret_cast(configuration.d->privateKey.handle())); -- else if (configuration.d->privateKey.algorithm() == QSsl::Dsa) -- q_EVP_PKEY_set1_DSA(sslContext->pkey, reinterpret_cast(configuration.d->privateKey.handle())); --#ifndef OPENSSL_NO_EC -- else if (configuration.d->privateKey.algorithm() == QSsl::Ec) -- q_EVP_PKEY_set1_EC_KEY(sslContext->pkey, reinterpret_cast(configuration.d->privateKey.handle())); --#endif -- } -- -- if (!q_SSL_CTX_use_PrivateKey(sslContext->ctx, sslContext->pkey)) { -- sslContext->errorStr = QSslSocket::tr("Error loading private key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -- sslContext->errorCode = QSslError::UnspecifiedError; -- return; -- } -- if (configuration.d->privateKey.algorithm() == QSsl::Opaque) -- sslContext->pkey = 0; // Don't free the private key, it belongs to QSslKey -- -- // Check if the certificate matches the private key. -- if (!q_SSL_CTX_check_private_key(sslContext->ctx)) { -- sslContext->errorStr = QSslSocket::tr("Private key does not certify public key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -- sslContext->errorCode = QSslError::UnspecifiedError; -- return; -- } -- -- // If we have any intermediate certificates then we need to add them to our chain -- bool first = true; -- for (const QSslCertificate &cert : qAsConst(configuration.d->localCertificateChain)) { -- if (first) { -- first = false; -- continue; -- } -- q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_EXTRA_CHAIN_CERT, 0, -- q_X509_dup(reinterpret_cast(cert.handle()))); -- } -- } -- -- // Initialize peer verification. -- if (sslContext->sslConfiguration.peerVerifyMode() == QSslSocket::VerifyNone) { -- q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_NONE, 0); -- } else { -- q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_PEER, q_X509Callback); -- } -- -- // Set verification depth. -- if (sslContext->sslConfiguration.peerVerifyDepth() != 0) -- q_SSL_CTX_set_verify_depth(sslContext->ctx, sslContext->sslConfiguration.peerVerifyDepth()); -- -- // set persisted session if the user set it -- if (!configuration.sessionTicket().isEmpty()) -- sslContext->setSessionASN1(configuration.sessionTicket()); -- -- // Set temp DH params -- QSslDiffieHellmanParameters dhparams = configuration.diffieHellmanParameters(); -- -- if (!dhparams.isValid()) { -- sslContext->errorStr = QSslSocket::tr("Diffie-Hellman parameters are not valid"); -- sslContext->errorCode = QSslError::UnspecifiedError; -- return; -- } -- -- if (!dhparams.isEmpty()) { -- const QByteArray ¶ms = dhparams.d->derData; -- const char *ptr = params.constData(); -- DH *dh = q_d2i_DHparams(NULL, reinterpret_cast(&ptr), params.length()); -- if (dh == NULL) -- qFatal("q_d2i_DHparams failed to convert QSslDiffieHellmanParameters to DER form"); -- q_SSL_CTX_set_tmp_dh(sslContext->ctx, dh); -- q_DH_free(dh); -- } -- --#ifndef OPENSSL_NO_EC --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -- if (q_SSLeay() >= 0x10002000L) { -- q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_SET_ECDH_AUTO, 1, NULL); -- } else --#endif -- { -- // Set temp ECDH params -- EC_KEY *ecdh = 0; -- ecdh = q_EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); -- q_SSL_CTX_set_tmp_ecdh(sslContext->ctx, ecdh); -- q_EC_KEY_free(ecdh); -- } --#endif // OPENSSL_NO_EC -- --#if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) -- if (!client) -- q_SSL_CTX_use_psk_identity_hint(sslContext->ctx, sslContext->sslConfiguration.preSharedKeyIdentityHint().constData()); --#endif // OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) -- -- const QVector qcurves = sslContext->sslConfiguration.ellipticCurves(); -- if (!qcurves.isEmpty()) { --#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) -- // Set the curves to be used -- if (q_SSLeay() >= 0x10002000L) { -- // SSL_CTX_ctrl wants a non-const pointer as last argument, -- // but let's avoid a copy into a temporary array -- if (!q_SSL_CTX_ctrl(sslContext->ctx, -- SSL_CTRL_SET_CURVES, -- qcurves.size(), -- const_cast(reinterpret_cast(qcurves.data())))) { -- sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -- sslContext->errorCode = QSslError::UnspecifiedError; -- } -- } else --#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) -- { -- // specific curves requested, but not possible to set -> error -- sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2")); -- sslContext->errorCode = QSslError::UnspecifiedError; -- } -- } --} -- - QSslContext* QSslContext::fromConfiguration(QSslSocket::SslMode mode, const QSslConfiguration &configuration, bool allowRootCertOnDemandLoading) - { - QSslContext *sslContext = new QSslContext(); -@@ -463,7 +160,7 @@ SSL* QSslContext::createSsl() - m_npnContext.len = m_supportedNPNVersions.count(); - m_npnContext.status = QSslConfiguration::NextProtocolNegotiationNone; - #if OPENSSL_VERSION_NUMBER >= 0x10002000L -- if (q_SSLeay() >= 0x10002000L) { -+ if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) { - // Callback's type has a parameter 'const unsigned char ** out' - // since it was introduced in 1.0.2. Internally, OpenSSL's own code - // (tests/examples) cast it to unsigned char * (since it's 'out'). -@@ -508,7 +205,7 @@ bool QSslContext::cacheSession(SSL* ssl) - unsigned char *data = reinterpret_cast(m_sessionASN1.data()); - if (!q_i2d_SSL_SESSION(session, &data)) - qCWarning(lcSsl, "could not store persistent version of SSL session"); -- m_sessionTicketLifeTimeHint = session->tlsext_tick_lifetime_hint; -+ m_sessionTicketLifeTimeHint = q_SSL_SESSION_get_ticket_lifetime_hint(session); - } - } - -diff --git a/qtbase/src/network/ssl/qsslcontext_openssl11.cpp b/qtbase/src/network/ssl/qsslcontext_openssl11.cpp -new file mode 100644 -index 0000000000..787b6ae3f5 ---- /dev/null -+++ b/qtbase/src/network/ssl/qsslcontext_openssl11.cpp -@@ -0,0 +1,277 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2017 The Qt Company Ltd. -+** Copyright (C) 2014 BlackBerry Limited. All rights reserved. -+** Copyright (C) 2014 Governikus GmbH & Co. KG. -+** Copyright (C) 2016 Richard J. Moore -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the QtNetwork module of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+ -+#include -+#include -+ -+#include "private/qssl_p.h" -+#include "private/qsslcontext_openssl_p.h" -+#include "private/qsslsocket_p.h" -+#include "private/qsslsocket_openssl_p.h" -+#include "private/qsslsocket_openssl_symbols_p.h" -+#include "private/qssldiffiehellmanparameters_p.h" -+ -+#include -+ -+QT_BEGIN_NAMESPACE -+ -+// defined in qsslsocket_openssl.cpp: -+extern int q_X509Callback(int ok, X509_STORE_CTX *ctx); -+extern QString getErrorsFromOpenSsl(); -+ -+static inline QString msgErrorSettingEllipticCurves(const QString &why) -+{ -+ return QSslSocket::tr("Error when setting the elliptic curves (%1)").arg(why); -+} -+ -+// static -+void QSslContext::initSslContext(QSslContext *sslContext, QSslSocket::SslMode mode, const QSslConfiguration &configuration, bool allowRootCertOnDemandLoading) -+{ -+ sslContext->sslConfiguration = configuration; -+ sslContext->errorCode = QSslError::NoError; -+ -+ bool client = (mode == QSslSocket::SslClientMode); -+ -+ bool reinitialized = false; -+ bool unsupportedProtocol = false; -+init_context: -+ if (sslContext->sslConfiguration.protocol() == QSsl::SslV2) { -+ // SSL 2 is no longer supported, but chosen deliberately -> error -+ sslContext->ctx = nullptr; -+ unsupportedProtocol = true; -+ } else { -+ // The ssl options will actually control the supported methods -+ sslContext->ctx = q_SSL_CTX_new(client ? q_TLS_client_method() : q_TLS_server_method()); -+ } -+ -+ if (!sslContext->ctx) { -+ // After stopping Flash 10 the SSL library loses its ciphers. Try re-adding them -+ // by re-initializing the library. -+ if (!reinitialized) { -+ reinitialized = true; -+ if (q_OPENSSL_init_ssl(0, nullptr) == 1) -+ goto init_context; -+ } -+ -+ sslContext->errorStr = QSslSocket::tr("Error creating SSL context (%1)").arg( -+ unsupportedProtocol ? QSslSocket::tr("unsupported protocol") : QSslSocketBackendPrivate::getErrorsFromOpenSsl() -+ ); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ // Enable bug workarounds. -+ long options = QSslSocketBackendPrivate::setupOpenSslOptions(configuration.protocol(), configuration.d->sslOptions); -+ q_SSL_CTX_set_options(sslContext->ctx, options); -+ -+ // Tell OpenSSL to release memory early -+ // http://www.openssl.org/docs/ssl/SSL_CTX_set_mode.html -+ q_SSL_CTX_set_mode(sslContext->ctx, SSL_MODE_RELEASE_BUFFERS); -+ -+ // Initialize ciphers -+ QByteArray cipherString; -+ bool first = true; -+ QList ciphers = sslContext->sslConfiguration.ciphers(); -+ if (ciphers.isEmpty()) -+ ciphers = QSslSocketPrivate::defaultCiphers(); -+ for (const QSslCipher &cipher : qAsConst(ciphers)) { -+ if (first) -+ first = false; -+ else -+ cipherString.append(':'); -+ cipherString.append(cipher.name().toLatin1()); -+ } -+ -+ if (!q_SSL_CTX_set_cipher_list(sslContext->ctx, cipherString.data())) { -+ sslContext->errorStr = QSslSocket::tr("Invalid or empty cipher list (%1)").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ const QDateTime now = QDateTime::currentDateTimeUtc(); -+ -+ // Add all our CAs to this store. -+ const auto caCertificates = sslContext->sslConfiguration.caCertificates(); -+ for (const QSslCertificate &caCertificate : caCertificates) { -+ // From https://www.openssl.org/docs/ssl/SSL_CTX_load_verify_locations.html: -+ // -+ // If several CA certificates matching the name, key identifier, and -+ // serial number condition are available, only the first one will be -+ // examined. This may lead to unexpected results if the same CA -+ // certificate is available with different expiration dates. If a -+ // ``certificate expired'' verification error occurs, no other -+ // certificate will be searched. Make sure to not have expired -+ // certificates mixed with valid ones. -+ // -+ // See also: QSslSocketBackendPrivate::verify() -+ if (caCertificate.expiryDate() >= now) { -+ q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(sslContext->ctx), (X509 *)caCertificate.handle()); -+ } -+ } -+ -+ if (QSslSocketPrivate::s_loadRootCertsOnDemand && allowRootCertOnDemandLoading) { -+ // tell OpenSSL the directories where to look up the root certs on demand -+ const QList unixDirs = QSslSocketPrivate::unixRootCertDirectories(); -+ for (const QByteArray &unixDir : unixDirs) -+ q_SSL_CTX_load_verify_locations(sslContext->ctx, nullptr, unixDir.constData()); -+ } -+ -+ if (!sslContext->sslConfiguration.localCertificate().isNull()) { -+ // Require a private key as well. -+ if (sslContext->sslConfiguration.privateKey().isNull()) { -+ sslContext->errorStr = QSslSocket::tr("Cannot provide a certificate with no key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ // Load certificate -+ if (!q_SSL_CTX_use_certificate(sslContext->ctx, (X509 *)sslContext->sslConfiguration.localCertificate().handle())) { -+ sslContext->errorStr = QSslSocket::tr("Error loading local certificate, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ if (configuration.d->privateKey.algorithm() == QSsl::Opaque) { -+ sslContext->pkey = reinterpret_cast(configuration.d->privateKey.handle()); -+ } else { -+ // Load private key -+ sslContext->pkey = q_EVP_PKEY_new(); -+ // before we were using EVP_PKEY_assign_R* functions and did not use EVP_PKEY_free. -+ // this lead to a memory leak. Now we use the *_set1_* functions which do not -+ // take ownership of the RSA/DSA key instance because the QSslKey already has ownership. -+ if (configuration.d->privateKey.algorithm() == QSsl::Rsa) -+ q_EVP_PKEY_set1_RSA(sslContext->pkey, reinterpret_cast(configuration.d->privateKey.handle())); -+ else if (configuration.d->privateKey.algorithm() == QSsl::Dsa) -+ q_EVP_PKEY_set1_DSA(sslContext->pkey, reinterpret_cast(configuration.d->privateKey.handle())); -+#ifndef OPENSSL_NO_EC -+ else if (configuration.d->privateKey.algorithm() == QSsl::Ec) -+ q_EVP_PKEY_set1_EC_KEY(sslContext->pkey, reinterpret_cast(configuration.d->privateKey.handle())); -+#endif -+ } -+ -+ if (!q_SSL_CTX_use_PrivateKey(sslContext->ctx, sslContext->pkey)) { -+ sslContext->errorStr = QSslSocket::tr("Error loading private key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ if (configuration.d->privateKey.algorithm() == QSsl::Opaque) -+ sslContext->pkey = nullptr; // Don't free the private key, it belongs to QSslKey -+ -+ // Check if the certificate matches the private key. -+ if (!q_SSL_CTX_check_private_key(sslContext->ctx)) { -+ sslContext->errorStr = QSslSocket::tr("Private key does not certify public key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ // If we have any intermediate certificates then we need to add them to our chain -+ bool first = true; -+ for (const QSslCertificate &cert : qAsConst(configuration.d->localCertificateChain)) { -+ if (first) { -+ first = false; -+ continue; -+ } -+ q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_EXTRA_CHAIN_CERT, 0, -+ q_X509_dup(reinterpret_cast(cert.handle()))); -+ } -+ } -+ -+ // Initialize peer verification. -+ if (sslContext->sslConfiguration.peerVerifyMode() == QSslSocket::VerifyNone) { -+ q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_NONE, nullptr); -+ } else { -+ q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_PEER, q_X509Callback); -+ } -+ -+ // Set verification depth. -+ if (sslContext->sslConfiguration.peerVerifyDepth() != 0) -+ q_SSL_CTX_set_verify_depth(sslContext->ctx, sslContext->sslConfiguration.peerVerifyDepth()); -+ -+ // set persisted session if the user set it -+ if (!configuration.sessionTicket().isEmpty()) -+ sslContext->setSessionASN1(configuration.sessionTicket()); -+ -+ // Set temp DH params -+ QSslDiffieHellmanParameters dhparams = configuration.diffieHellmanParameters(); -+ -+ if (!dhparams.isValid()) { -+ sslContext->errorStr = QSslSocket::tr("Diffie-Hellman parameters are not valid"); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ if (!dhparams.isEmpty()) { -+ const QByteArray ¶ms = dhparams.d->derData; -+ const char *ptr = params.constData(); -+ DH *dh = q_d2i_DHparams(NULL, reinterpret_cast(&ptr), params.length()); -+ if (dh == NULL) -+ qFatal("q_d2i_DHparams failed to convert QSslDiffieHellmanParameters to DER form"); -+ q_SSL_CTX_set_tmp_dh(sslContext->ctx, dh); -+ q_DH_free(dh); -+ } -+ -+#ifndef OPENSSL_NO_PSK -+ if (!client) -+ q_SSL_CTX_use_psk_identity_hint(sslContext->ctx, sslContext->sslConfiguration.preSharedKeyIdentityHint().constData()); -+#endif // !OPENSSL_NO_PSK -+ -+ const QVector qcurves = sslContext->sslConfiguration.ellipticCurves(); -+ if (!qcurves.isEmpty()) { -+#ifdef OPENSSL_NO_EC -+ sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version with disabled elliptic curves")); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+#else -+ // Set the curves to be used. -+ std::vector curves; -+ curves.reserve(qcurves.size()); -+ for (const auto &sslCurve : qcurves) -+ curves.push_back(sslCurve.id); -+ if (!q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_SET_CURVES, long(curves.size()), &curves[0])) { -+ sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ } -+#endif -+ } -+} -+ -+QT_END_NAMESPACE -diff --git a/qtbase/src/network/ssl/qsslcontext_opensslpre11.cpp b/qtbase/src/network/ssl/qsslcontext_opensslpre11.cpp -new file mode 100644 -index 0000000000..9c01c2f2dc ---- /dev/null -+++ b/qtbase/src/network/ssl/qsslcontext_opensslpre11.cpp -@@ -0,0 +1,354 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2017 The Qt Company Ltd. -+** Copyright (C) 2014 BlackBerry Limited. All rights reserved. -+** Copyright (C) 2014 Governikus GmbH & Co. KG. -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the QtNetwork module of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+ -+#include -+#include -+ -+#include "private/qssl_p.h" -+#include "private/qsslcontext_openssl_p.h" -+#include "private/qsslsocket_p.h" -+#include "private/qsslsocket_openssl_p.h" -+#include "private/qsslsocket_openssl_symbols_p.h" -+#include "private/qssldiffiehellmanparameters_p.h" -+ -+QT_BEGIN_NAMESPACE -+ -+// defined in qsslsocket_openssl.cpp: -+extern int q_X509Callback(int ok, X509_STORE_CTX *ctx); -+extern QString getErrorsFromOpenSsl(); -+ -+static inline QString msgErrorSettingEllipticCurves(const QString &why) -+{ -+ return QSslSocket::tr("Error when setting the elliptic curves (%1)").arg(why); -+} -+ -+// static -+void QSslContext::initSslContext(QSslContext *sslContext, QSslSocket::SslMode mode, const QSslConfiguration &configuration, bool allowRootCertOnDemandLoading) -+{ -+ sslContext->sslConfiguration = configuration; -+ sslContext->errorCode = QSslError::NoError; -+ -+ bool client = (mode == QSslSocket::SslClientMode); -+ -+ bool reinitialized = false; -+ bool unsupportedProtocol = false; -+init_context: -+ switch (sslContext->sslConfiguration.protocol()) { -+ case QSsl::SslV2: -+#ifndef OPENSSL_NO_SSL2 -+ sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv2_client_method() : q_SSLv2_server_method()); -+#else -+ // SSL 2 not supported by the system, but chosen deliberately -> error -+ sslContext->ctx = 0; -+ unsupportedProtocol = true; -+#endif -+ break; -+ case QSsl::SslV3: -+#ifndef OPENSSL_NO_SSL3_METHOD -+ sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); -+#else -+ // SSL 3 not supported by the system, but chosen deliberately -> error -+ sslContext->ctx = 0; -+ unsupportedProtocol = true; -+#endif -+ break; -+ case QSsl::SecureProtocols: -+ // SSLv2 and SSLv3 will be disabled by SSL options -+ // But we need q_SSLv23_server_method() otherwise AnyProtocol will be unable to connect on Win32. -+ case QSsl::TlsV1SslV3: -+ // SSLv2 will will be disabled by SSL options -+ case QSsl::AnyProtocol: -+ default: -+ sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); -+ break; -+ case QSsl::TlsV1_0: -+ sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method()); -+ break; -+ case QSsl::TlsV1_1: -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+ sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_1_client_method() : q_TLSv1_1_server_method()); -+#else -+ // TLS 1.1 not supported by the system, but chosen deliberately -> error -+ sslContext->ctx = 0; -+ unsupportedProtocol = true; -+#endif -+ break; -+ case QSsl::TlsV1_2: -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+ sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_2_client_method() : q_TLSv1_2_server_method()); -+#else -+ // TLS 1.2 not supported by the system, but chosen deliberately -> error -+ sslContext->ctx = 0; -+ unsupportedProtocol = true; -+#endif -+ break; -+ case QSsl::TlsV1_0OrLater: -+ // Specific protocols will be specified via SSL options. -+ sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); -+ break; -+ case QSsl::TlsV1_1OrLater: -+ case QSsl::TlsV1_2OrLater: -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+ // Specific protocols will be specified via SSL options. -+ sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); -+#else -+ // TLS 1.1/1.2 not supported by the system, but chosen deliberately -> error -+ sslContext->ctx = 0; -+ unsupportedProtocol = true; -+#endif -+ break; -+ } -+ -+ if (!sslContext->ctx) { -+ // After stopping Flash 10 the SSL library loses its ciphers. Try re-adding them -+ // by re-initializing the library. -+ if (!reinitialized) { -+ reinitialized = true; -+ if (q_SSL_library_init() == 1) -+ goto init_context; -+ } -+ -+ sslContext->errorStr = QSslSocket::tr("Error creating SSL context (%1)").arg( -+ unsupportedProtocol ? QSslSocket::tr("unsupported protocol") : QSslSocketBackendPrivate::getErrorsFromOpenSsl() -+ ); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ // Enable bug workarounds. -+ long options = QSslSocketBackendPrivate::setupOpenSslOptions(configuration.protocol(), configuration.d->sslOptions); -+ q_SSL_CTX_set_options(sslContext->ctx, options); -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ // Tell OpenSSL to release memory early -+ // http://www.openssl.org/docs/ssl/SSL_CTX_set_mode.html -+ if (q_SSLeay() >= 0x10000000L) -+ q_SSL_CTX_set_mode(sslContext->ctx, SSL_MODE_RELEASE_BUFFERS); -+#endif -+ -+ // Initialize ciphers -+ QByteArray cipherString; -+ bool first = true; -+ QList ciphers = sslContext->sslConfiguration.ciphers(); -+ if (ciphers.isEmpty()) -+ ciphers = QSslSocketPrivate::defaultCiphers(); -+ for (const QSslCipher &cipher : qAsConst(ciphers)) { -+ if (first) -+ first = false; -+ else -+ cipherString.append(':'); -+ cipherString.append(cipher.name().toLatin1()); -+ } -+ -+ if (!q_SSL_CTX_set_cipher_list(sslContext->ctx, cipherString.data())) { -+ sslContext->errorStr = QSslSocket::tr("Invalid or empty cipher list (%1)").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ const QDateTime now = QDateTime::currentDateTimeUtc(); -+ -+ // Add all our CAs to this store. -+ const auto caCertificates = sslContext->sslConfiguration.caCertificates(); -+ for (const QSslCertificate &caCertificate : caCertificates) { -+ // From https://www.openssl.org/docs/ssl/SSL_CTX_load_verify_locations.html: -+ // -+ // If several CA certificates matching the name, key identifier, and -+ // serial number condition are available, only the first one will be -+ // examined. This may lead to unexpected results if the same CA -+ // certificate is available with different expiration dates. If a -+ // ``certificate expired'' verification error occurs, no other -+ // certificate will be searched. Make sure to not have expired -+ // certificates mixed with valid ones. -+ // -+ // See also: QSslSocketBackendPrivate::verify() -+ if (caCertificate.expiryDate() >= now) { -+ q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(sslContext->ctx), (X509 *)caCertificate.handle()); -+ } -+ } -+ -+ if (QSslSocketPrivate::s_loadRootCertsOnDemand && allowRootCertOnDemandLoading) { -+ // tell OpenSSL the directories where to look up the root certs on demand -+ const QList unixDirs = QSslSocketPrivate::unixRootCertDirectories(); -+ for (const QByteArray &unixDir : unixDirs) -+ q_SSL_CTX_load_verify_locations(sslContext->ctx, 0, unixDir.constData()); -+ } -+ -+ if (!sslContext->sslConfiguration.localCertificate().isNull()) { -+ // Require a private key as well. -+ if (sslContext->sslConfiguration.privateKey().isNull()) { -+ sslContext->errorStr = QSslSocket::tr("Cannot provide a certificate with no key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ // Load certificate -+ if (!q_SSL_CTX_use_certificate(sslContext->ctx, (X509 *)sslContext->sslConfiguration.localCertificate().handle())) { -+ sslContext->errorStr = QSslSocket::tr("Error loading local certificate, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ if (configuration.d->privateKey.algorithm() == QSsl::Opaque) { -+ sslContext->pkey = reinterpret_cast(configuration.d->privateKey.handle()); -+ } else { -+ // Load private key -+ sslContext->pkey = q_EVP_PKEY_new(); -+ // before we were using EVP_PKEY_assign_R* functions and did not use EVP_PKEY_free. -+ // this lead to a memory leak. Now we use the *_set1_* functions which do not -+ // take ownership of the RSA/DSA key instance because the QSslKey already has ownership. -+ if (configuration.d->privateKey.algorithm() == QSsl::Rsa) -+ q_EVP_PKEY_set1_RSA(sslContext->pkey, reinterpret_cast(configuration.d->privateKey.handle())); -+ else if (configuration.d->privateKey.algorithm() == QSsl::Dsa) -+ q_EVP_PKEY_set1_DSA(sslContext->pkey, reinterpret_cast(configuration.d->privateKey.handle())); -+#ifndef OPENSSL_NO_EC -+ else if (configuration.d->privateKey.algorithm() == QSsl::Ec) -+ q_EVP_PKEY_set1_EC_KEY(sslContext->pkey, reinterpret_cast(configuration.d->privateKey.handle())); -+#endif -+ } -+ -+ if (!q_SSL_CTX_use_PrivateKey(sslContext->ctx, sslContext->pkey)) { -+ sslContext->errorStr = QSslSocket::tr("Error loading private key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ if (configuration.d->privateKey.algorithm() == QSsl::Opaque) -+ sslContext->pkey = 0; // Don't free the private key, it belongs to QSslKey -+ -+ // Check if the certificate matches the private key. -+ if (!q_SSL_CTX_check_private_key(sslContext->ctx)) { -+ sslContext->errorStr = QSslSocket::tr("Private key does not certify public key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ // If we have any intermediate certificates then we need to add them to our chain -+ bool first = true; -+ for (const QSslCertificate &cert : qAsConst(configuration.d->localCertificateChain)) { -+ if (first) { -+ first = false; -+ continue; -+ } -+ q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_EXTRA_CHAIN_CERT, 0, -+ q_X509_dup(reinterpret_cast(cert.handle()))); -+ } -+ } -+ -+ // Initialize peer verification. -+ if (sslContext->sslConfiguration.peerVerifyMode() == QSslSocket::VerifyNone) { -+ q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_NONE, 0); -+ } else { -+ q_SSL_CTX_set_verify(sslContext->ctx, SSL_VERIFY_PEER, q_X509Callback); -+ } -+ -+ // Set verification depth. -+ if (sslContext->sslConfiguration.peerVerifyDepth() != 0) -+ q_SSL_CTX_set_verify_depth(sslContext->ctx, sslContext->sslConfiguration.peerVerifyDepth()); -+ -+ // set persisted session if the user set it -+ if (!configuration.sessionTicket().isEmpty()) -+ sslContext->setSessionASN1(configuration.sessionTicket()); -+ -+ // Set temp DH params -+ QSslDiffieHellmanParameters dhparams = configuration.diffieHellmanParameters(); -+ -+ if (!dhparams.isValid()) { -+ sslContext->errorStr = QSslSocket::tr("Diffie-Hellman parameters are not valid"); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ return; -+ } -+ -+ if (!dhparams.isEmpty()) { -+ const QByteArray ¶ms = dhparams.d->derData; -+ const char *ptr = params.constData(); -+ DH *dh = q_d2i_DHparams(NULL, reinterpret_cast(&ptr), params.length()); -+ if (dh == NULL) -+ qFatal("q_d2i_DHparams failed to convert QSslDiffieHellmanParameters to DER form"); -+ q_SSL_CTX_set_tmp_dh(sslContext->ctx, dh); -+ q_DH_free(dh); -+ } -+ -+#ifndef OPENSSL_NO_EC -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+ if (q_SSLeay() >= 0x10002000L) { -+ q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_SET_ECDH_AUTO, 1, NULL); -+ } else -+#endif -+ { -+ // Set temp ECDH params -+ EC_KEY *ecdh = 0; -+ ecdh = q_EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); -+ q_SSL_CTX_set_tmp_ecdh(sslContext->ctx, ecdh); -+ q_EC_KEY_free(ecdh); -+ } -+#endif // OPENSSL_NO_EC -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) -+ if (!client) -+ q_SSL_CTX_use_psk_identity_hint(sslContext->ctx, sslContext->sslConfiguration.preSharedKeyIdentityHint().constData()); -+#endif // OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) -+ -+ const QVector qcurves = sslContext->sslConfiguration.ellipticCurves(); -+ if (!qcurves.isEmpty()) { -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) -+ // Set the curves to be used -+ if (q_SSLeay() >= 0x10002000L) { -+ // SSL_CTX_ctrl wants a non-const pointer as last argument, -+ // but let's avoid a copy into a temporary array -+ if (!q_SSL_CTX_ctrl(sslContext->ctx, -+ SSL_CTRL_SET_CURVES, -+ qcurves.size(), -+ const_cast(reinterpret_cast(qcurves.data())))) { -+ sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ } -+ } else -+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) -+ { -+ // specific curves requested, but not possible to set -> error -+ sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2")); -+ sslContext->errorCode = QSslError::UnspecifiedError; -+ } -+ } -+} -+ -+QT_END_NAMESPACE -diff --git a/qtbase/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp b/qtbase/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp -index 90687b05c5..5ebad822f1 100644 ---- a/qtbase/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp -+++ b/qtbase/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp -@@ -1,6 +1,7 @@ - /**************************************************************************** - ** - ** Copyright (C) 2015 Mikkel Krautz -+** Copyright (C) 2016 Richard J. Moore - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtNetwork module of the Qt Toolkit. -@@ -50,8 +51,8 @@ - #include - #endif - --// For q_BN_is_word. - #include -+#include - - QT_BEGIN_NAMESPACE - -@@ -62,13 +63,6 @@ static bool isSafeDH(DH *dh) - - QSslSocketPrivate::ensureInitialized(); - -- // Mark p < 1024 bits as unsafe. -- if (q_BN_num_bits(dh->p) < 1024) { -- return false; -- } -- -- if (q_DH_check(dh, &status) != 1) -- return false; - - // From https://wiki.openssl.org/index.php/Diffie-Hellman_parameters: - // -@@ -81,11 +75,39 @@ static bool isSafeDH(DH *dh) - // Without the test, the IETF parameters would - // fail validation. For details, see Diffie-Hellman - // Parameter Check (when g = 2, must p mod 24 == 11?). -+#if QT_CONFIG(opensslv11) -+ // Mark p < 1024 bits as unsafe. -+ if (q_DH_bits(dh) < 1024) -+ return false; -+ -+ if (q_DH_check(dh, &status) != 1) -+ return false; -+ -+ const BIGNUM *p = nullptr; -+ const BIGNUM *q = nullptr; -+ const BIGNUM *g = nullptr; -+ q_DH_get0_pqg(dh, &p, &q, &g); -+ -+ if (q_BN_is_word(const_cast(g), DH_GENERATOR_2)) { -+ long residue = q_BN_mod_word(p, 24); -+ if (residue == 11 || residue == 23) -+ status &= ~DH_NOT_SUITABLE_GENERATOR; -+ } -+ -+#else -+ // Mark p < 1024 bits as unsafe. -+ if (q_BN_num_bits(dh->p) < 1024) -+ return false; -+ -+ if (q_DH_check(dh, &status) != 1) -+ return false; -+ - if (q_BN_is_word(dh->g, DH_GENERATOR_2)) { - long residue = q_BN_mod_word(dh->p, 24); - if (residue == 11 || residue == 23) - status &= ~DH_NOT_SUITABLE_GENERATOR; - } -+#endif - - bad |= DH_CHECK_P_NOT_PRIME; - bad |= DH_CHECK_P_NOT_SAFE_PRIME; -diff --git a/qtbase/src/network/ssl/qsslellipticcurve.h b/qtbase/src/network/ssl/qsslellipticcurve.h -index 231566063e..57dda19bad 100644 ---- a/qtbase/src/network/ssl/qsslellipticcurve.h -+++ b/qtbase/src/network/ssl/qsslellipticcurve.h -@@ -80,6 +80,7 @@ private: - friend Q_DECL_CONSTEXPR bool operator==(QSslEllipticCurve lhs, QSslEllipticCurve rhs) Q_DECL_NOTHROW; - friend Q_DECL_CONSTEXPR uint qHash(QSslEllipticCurve curve, uint seed) Q_DECL_NOTHROW; - -+ friend class QSslContext; - friend class QSslSocketPrivate; - friend class QSslSocketBackendPrivate; - }; -diff --git a/qtbase/src/network/ssl/qsslellipticcurve_openssl.cpp b/qtbase/src/network/ssl/qsslellipticcurve_openssl.cpp -index e18197b703..8cd14837f0 100644 ---- a/qtbase/src/network/ssl/qsslellipticcurve_openssl.cpp -+++ b/qtbase/src/network/ssl/qsslellipticcurve_openssl.cpp -@@ -1,6 +1,7 @@ - /**************************************************************************** - ** - ** Copyright (C) 2014 Governikus GmbH & Co. KG. -+** Copyright (C) 2016 Richard J. Moore - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtNetwork module of the Qt Toolkit. -@@ -78,17 +79,18 @@ QSslEllipticCurve QSslEllipticCurve::fromShortName(const QString &name) - QSslEllipticCurve result; - - #ifndef OPENSSL_NO_EC -- const QByteArray curveNameLatin1 = name.toLatin1(); - -+ const QByteArray curveNameLatin1 = name.toLatin1(); - int nid = q_OBJ_sn2nid(curveNameLatin1.data()); - - #if OPENSSL_VERSION_NUMBER >= 0x10002000L -- if (nid == 0 && q_SSLeay() >= 0x10002000L) -+ if (nid == 0 && QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) - nid = q_EC_curve_nist2nid(curveNameLatin1.data()); - #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L - - result.id = nid; --#endif -+ -+#endif // !OPENSSL_NO_EC - - return result; - } -diff --git a/qtbase/src/network/ssl/qsslkey_openssl.cpp b/qtbase/src/network/ssl/qsslkey_openssl.cpp -index 26119023d1..2b03af9441 100644 ---- a/qtbase/src/network/ssl/qsslkey_openssl.cpp -+++ b/qtbase/src/network/ssl/qsslkey_openssl.cpp -@@ -1,6 +1,7 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. -+** Copyright (C) 2017 The Qt Company Ltd. -+** Copyright (C) 2016 Richard J. Moore - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtNetwork module of the Qt Toolkit. -@@ -87,33 +88,32 @@ bool QSslKeyPrivate::fromEVP_PKEY(EVP_PKEY *pkey) - if (pkey == nullptr) - return false; - -- if (pkey->type == EVP_PKEY_RSA) { -+#if QT_CONFIG(opensslv11) -+ const int keyType = q_EVP_PKEY_type(q_EVP_PKEY_base_id(pkey)); -+#else -+ const int keyType = pkey->type; -+#endif -+ if (keyType == EVP_PKEY_RSA) { - isNull = false; - algorithm = QSsl::Rsa; - type = QSsl::PrivateKey; - -- rsa = q_RSA_new(); -- memcpy(rsa, q_EVP_PKEY_get1_RSA(pkey), sizeof(RSA)); -- -+ rsa = q_EVP_PKEY_get1_RSA(pkey); - return true; -- } -- else if (pkey->type == EVP_PKEY_DSA) { -+ } else if (keyType == EVP_PKEY_DSA) { - isNull = false; - algorithm = QSsl::Dsa; - type = QSsl::PrivateKey; - -- dsa = q_DSA_new(); -- memcpy(dsa, q_EVP_PKEY_get1_DSA(pkey), sizeof(DSA)); -- -+ dsa = q_EVP_PKEY_get1_DSA(pkey); - return true; - } - #ifndef OPENSSL_NO_EC -- else if (pkey->type == EVP_PKEY_EC) { -+ else if (keyType == EVP_PKEY_EC) { - isNull = false; - algorithm = QSsl::Ec; - type = QSsl::PrivateKey; -- ec = q_EC_KEY_dup(q_EVP_PKEY_get1_EC_KEY(pkey)); -- -+ ec = q_EVP_PKEY_get1_EC_KEY(pkey); - return true; - } - #endif -@@ -181,8 +181,8 @@ int QSslKeyPrivate::length() const - return -1; - - switch (algorithm) { -- case QSsl::Rsa: return q_BN_num_bits(rsa->n); -- case QSsl::Dsa: return q_BN_num_bits(dsa->p); -+ case QSsl::Rsa: return q_RSA_bits(rsa); -+ case QSsl::Dsa: return q_DSA_bits(dsa); - #ifndef OPENSSL_NO_EC - case QSsl::Ec: return q_EC_GROUP_get_degree(q_EC_KEY_get0_group(ec)); - #endif -@@ -276,7 +276,13 @@ Qt::HANDLE QSslKeyPrivate::handle() const - - static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data, const QByteArray &key, const QByteArray &iv, int enc) - { -- EVP_CIPHER_CTX ctx; -+#if QT_CONFIG(opensslv11) -+ EVP_CIPHER_CTX *ctx = q_EVP_CIPHER_CTX_new(); -+#else -+ EVP_CIPHER_CTX evpCipherContext; -+ EVP_CIPHER_CTX *ctx = &evpCipherContext; -+#endif -+ - const EVP_CIPHER* type = 0; - int i = 0, len = 0; - -@@ -294,21 +300,44 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data, - - QByteArray output; - output.resize(data.size() + EVP_MAX_BLOCK_LENGTH); -- q_EVP_CIPHER_CTX_init(&ctx); -- q_EVP_CipherInit(&ctx, type, NULL, NULL, enc); -- q_EVP_CIPHER_CTX_set_key_length(&ctx, key.size()); -+ -+#if QT_CONFIG(opensslv11) -+ q_EVP_CIPHER_CTX_reset(ctx); -+#else -+ q_EVP_CIPHER_CTX_init(ctx); -+#endif -+ -+ q_EVP_CipherInit(ctx, type, NULL, NULL, enc); -+ q_EVP_CIPHER_CTX_set_key_length(ctx, key.size()); - if (cipher == QSslKeyPrivate::Rc2Cbc) -- q_EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_SET_RC2_KEY_BITS, 8 * key.size(), NULL); -- q_EVP_CipherInit(&ctx, NULL, -+ q_EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_SET_RC2_KEY_BITS, 8 * key.size(), NULL); -+ -+#if QT_CONFIG(opensslv11) -+ // EVP_CipherInit in 1.1 resets the context thus making the calls above useless. -+ // We call EVP_CipherInit_ex instead. -+ q_EVP_CipherInit_ex(ctx, nullptr, nullptr, -+ reinterpret_cast(key.constData()), -+ reinterpret_cast(iv.constData()), -+ enc); -+#else -+ q_EVP_CipherInit(ctx, NULL, - reinterpret_cast(key.constData()), - reinterpret_cast(iv.constData()), enc); -- q_EVP_CipherUpdate(&ctx, -+#endif // opensslv11 -+ -+ q_EVP_CipherUpdate(ctx, - reinterpret_cast(output.data()), &len, - reinterpret_cast(data.constData()), data.size()); -- q_EVP_CipherFinal(&ctx, -+ q_EVP_CipherFinal(ctx, - reinterpret_cast(output.data()) + len, &i); - len += i; -- q_EVP_CIPHER_CTX_cleanup(&ctx); -+ -+#if QT_CONFIG(opensslv11) -+ q_EVP_CIPHER_CTX_reset(ctx); -+ q_EVP_CIPHER_CTX_free(ctx); -+#else -+ q_EVP_CIPHER_CTX_cleanup(ctx); -+#endif - - return output.left(len); - } -diff --git a/qtbase/src/network/ssl/qsslsocket_openssl.cpp b/qtbase/src/network/ssl/qsslsocket_openssl.cpp -index f5b493897e..45cea490fc 100644 ---- a/qtbase/src/network/ssl/qsslsocket_openssl.cpp -+++ b/qtbase/src/network/ssl/qsslsocket_openssl.cpp -@@ -1,6 +1,6 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. -+** Copyright (C) 2017 The Qt Company Ltd. - ** Copyright (C) 2014 Governikus GmbH & Co. KG - ** Contact: https://www.qt.io/licensing/ - ** -@@ -97,70 +97,6 @@ bool QSslSocketPrivate::s_loadRootCertsOnDemand = false; - int QSslSocketBackendPrivate::s_indexForSSLExtraData = -1; - #endif - --/* \internal -- -- From OpenSSL's thread(3) manual page: -- -- OpenSSL can safely be used in multi-threaded applications provided that at -- least two callback functions are set. -- -- locking_function(int mode, int n, const char *file, int line) is needed to -- perform locking on shared data structures. (Note that OpenSSL uses a -- number of global data structures that will be implicitly shared -- whenever multiple threads use OpenSSL.) Multi-threaded -- applications will crash at random if it is not set. ... -- ... -- id_function(void) is a function that returns a thread ID. It is not -- needed on Windows nor on platforms where getpid() returns a different -- ID for each thread (most notably Linux) --*/ --class QOpenSslLocks --{ --public: -- inline QOpenSslLocks() -- : initLocker(QMutex::Recursive), -- locksLocker(QMutex::Recursive) -- { -- QMutexLocker locker(&locksLocker); -- int numLocks = q_CRYPTO_num_locks(); -- locks = new QMutex *[numLocks]; -- memset(locks, 0, numLocks * sizeof(QMutex *)); -- } -- inline ~QOpenSslLocks() -- { -- QMutexLocker locker(&locksLocker); -- for (int i = 0; i < q_CRYPTO_num_locks(); ++i) -- delete locks[i]; -- delete [] locks; -- -- QSslSocketPrivate::deinitialize(); -- } -- inline QMutex *lock(int num) -- { -- QMutexLocker locker(&locksLocker); -- QMutex *tmp = locks[num]; -- if (!tmp) -- tmp = locks[num] = new QMutex(QMutex::Recursive); -- return tmp; -- } -- -- QMutex *globalLock() -- { -- return &locksLocker; -- } -- -- QMutex *initLock() -- { -- return &initLocker; -- } -- --private: -- QMutex initLocker; -- QMutex locksLocker; -- QMutex **locks; --}; --Q_GLOBAL_STATIC(QOpenSslLocks, openssl_locks) -- - QString QSslSocketBackendPrivate::getErrorsFromOpenSsl() - { - QString errorString; -@@ -175,20 +111,6 @@ QString QSslSocketBackendPrivate::getErrorsFromOpenSsl() - } - - extern "C" { --static void locking_function(int mode, int lockNumber, const char *, int) --{ -- QMutex *mutex = openssl_locks()->lock(lockNumber); -- -- // Lock or unlock it -- if (mode & CRYPTO_LOCK) -- mutex->lock(); -- else -- mutex->unlock(); --} --static unsigned long id_function() --{ -- return (quintptr)QThread::currentThreadId(); --} - - #if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) - static unsigned int q_ssl_psk_client_callback(SSL *ssl, -@@ -227,7 +149,7 @@ QSslSocketBackendPrivate::~QSslSocketBackendPrivate() - destroySslContext(); - } - --QSslCipher QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(SSL_CIPHER *cipher) -+QSslCipher QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(const SSL_CIPHER *cipher) - { - QSslCipher ciph; - -@@ -283,6 +205,7 @@ struct QSslErrorList - QMutex mutex; - QVector errors; - }; -+ - Q_GLOBAL_STATIC(QSslErrorList, _q_sslErrorList) - - int q_X509Callback(int ok, X509_STORE_CTX *ctx) -@@ -312,7 +235,7 @@ int q_X509Callback(int ok, X509_STORE_CTX *ctx) - } - #endif - } -- // Always return OK to allow verification to continue. We're handle the -+ // Always return OK to allow verification to continue. We handle the - // errors gracefully after collecting all errors, after verification has - // completed. - return 1; -@@ -397,7 +320,7 @@ bool QSslSocketBackendPrivate::initSslContext() - if (configuration.protocol != QSsl::SslV2 && - configuration.protocol != QSsl::SslV3 && - configuration.protocol != QSsl::UnknownProtocol && -- mode == QSslSocket::SslClientMode && q_SSLeay() >= 0x00090806fL) { -+ mode == QSslSocket::SslClientMode && QSslSocket::sslLibraryVersionNumber() >= 0x00090806fL) { - // Set server hostname on TLS extension. RFC4366 section 3.1 requires it in ACE format. - QString tlsHostName = verificationPeerName.isEmpty() ? q->peerName() : verificationPeerName; - if (tlsHostName.isEmpty()) -@@ -438,13 +361,13 @@ bool QSslSocketBackendPrivate::initSslContext() - - #if OPENSSL_VERSION_NUMBER >= 0x10001000L - // Save a pointer to this object into the SSL structure. -- if (q_SSLeay() >= 0x10001000L) -+ if (QSslSocket::sslLibraryVersionNumber() >= 0x10001000L) - q_SSL_set_ex_data(ssl, s_indexForSSLExtraData, this); - #endif - - #if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) - // Set the client callback for PSK -- if (q_SSLeay() >= 0x10001000L) { -+ if (QSslSocket::sslLibraryVersionNumber() >= 0x10001000L) { - if (mode == QSslSocket::SslClientMode) - q_SSL_set_psk_client_callback(ssl, &q_ssl_psk_client_callback); - else if (mode == QSslSocket::SslServerMode) -@@ -464,16 +387,6 @@ void QSslSocketBackendPrivate::destroySslContext() - sslContextPointer.clear(); - } - --/*! -- \internal --*/ --void QSslSocketPrivate::deinitialize() --{ -- q_CRYPTO_set_id_callback(0); -- q_CRYPTO_set_locking_callback(0); -- q_ERR_free_strings(); --} -- - /*! - \internal - -@@ -486,91 +399,6 @@ bool QSslSocketPrivate::supportsSsl() - return ensureLibraryLoaded(); - } - --bool QSslSocketPrivate::ensureLibraryLoaded() --{ -- if (!q_resolveOpenSslSymbols()) -- return false; -- -- // Check if the library itself needs to be initialized. -- QMutexLocker locker(openssl_locks()->initLock()); -- -- if (!s_libraryLoaded) { -- s_libraryLoaded = true; -- -- // Initialize OpenSSL. -- q_CRYPTO_set_id_callback(id_function); -- q_CRYPTO_set_locking_callback(locking_function); -- if (q_SSL_library_init() != 1) -- return false; -- q_SSL_load_error_strings(); -- q_OpenSSL_add_all_algorithms(); -- --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -- if (q_SSLeay() >= 0x10001000L) -- QSslSocketBackendPrivate::s_indexForSSLExtraData = q_SSL_get_ex_new_index(0L, NULL, NULL, NULL, NULL); --#endif -- -- // Initialize OpenSSL's random seed. -- if (!q_RAND_status()) { -- qWarning("Random number generator not seeded, disabling SSL support"); -- return false; -- } -- } -- return true; --} -- --void QSslSocketPrivate::ensureCiphersAndCertsLoaded() --{ -- QMutexLocker locker(openssl_locks()->initLock()); -- if (s_loadedCiphersAndCerts) -- return; -- s_loadedCiphersAndCerts = true; -- -- resetDefaultCiphers(); -- resetDefaultEllipticCurves(); -- --#if QT_CONFIG(library) -- //load symbols needed to receive certificates from system store --#if defined(Q_OS_WIN) -- HINSTANCE hLib = LoadLibraryW(L"Crypt32"); -- if (hLib) { -- ptrCertOpenSystemStoreW = (PtrCertOpenSystemStoreW)GetProcAddress(hLib, "CertOpenSystemStoreW"); -- ptrCertFindCertificateInStore = (PtrCertFindCertificateInStore)GetProcAddress(hLib, "CertFindCertificateInStore"); -- ptrCertCloseStore = (PtrCertCloseStore)GetProcAddress(hLib, "CertCloseStore"); -- if (!ptrCertOpenSystemStoreW || !ptrCertFindCertificateInStore || !ptrCertCloseStore) -- qCWarning(lcSsl, "could not resolve symbols in crypt32 library"); // should never happen -- } else { -- qCWarning(lcSsl, "could not load crypt32 library"); // should never happen -- } --#elif defined(Q_OS_QNX) -- s_loadRootCertsOnDemand = true; --#elif defined(Q_OS_UNIX) && !defined(Q_OS_MAC) -- // check whether we can enable on-demand root-cert loading (i.e. check whether the sym links are there) -- QList dirs = unixRootCertDirectories(); -- QStringList symLinkFilter; -- symLinkFilter << QLatin1String("[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].[0-9]"); -- for (int a = 0; a < dirs.count(); ++a) { -- QDirIterator iterator(QLatin1String(dirs.at(a)), symLinkFilter, QDir::Files); -- if (iterator.hasNext()) { -- s_loadRootCertsOnDemand = true; -- break; -- } -- } --#endif --#endif // QT_CONFIG(library) -- // if on-demand loading was not enabled, load the certs now -- if (!s_loadRootCertsOnDemand) -- setDefaultCaCertificates(systemCaCertificates()); --#ifdef Q_OS_WIN -- //Enabled for fetching additional root certs from windows update on windows 6+ -- //This flag is set false by setDefaultCaCertificates() indicating the app uses -- //its own cert bundle rather than the system one. -- //Same logic that disables the unix on demand cert loading. -- //Unlike unix, we do preload the certificates from the cert store. -- if ((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) >= QSysInfo::WV_6_0) -- s_loadRootCertsOnDemand = true; --#endif --} - - /*! - \internal -@@ -587,26 +415,6 @@ void QSslSocketPrivate::ensureInitialized() - ensureCiphersAndCertsLoaded(); - } - --long QSslSocketPrivate::sslLibraryVersionNumber() --{ -- if (!supportsSsl()) -- return 0; -- -- return q_SSLeay(); --} -- --QString QSslSocketPrivate::sslLibraryVersionString() --{ -- if (!supportsSsl()) -- return QString(); -- -- const char *versionString = q_SSLeay_version(SSLEAY_VERSION); -- if (!versionString) -- return QString(); -- -- return QString::fromLatin1(versionString); --} -- - long QSslSocketPrivate::sslLibraryBuildVersionNumber() - { - return OPENSSL_VERSION_NUMBER; -@@ -628,7 +436,11 @@ QString QSslSocketPrivate::sslLibraryBuildVersionString() - */ - void QSslSocketPrivate::resetDefaultCiphers() - { -+#if QT_CONFIG(opensslv11) -+ SSL_CTX *myCtx = q_SSL_CTX_new(q_TLS_client_method()); -+#else - SSL_CTX *myCtx = q_SSL_CTX_new(q_SSLv23_client_method()); -+#endif - SSL *mySsl = q_SSL_new(myCtx); - - QList ciphers; -@@ -664,7 +476,7 @@ void QSslSocketPrivate::resetDefaultEllipticCurves() - QVector curves; - - #ifndef OPENSSL_NO_EC -- const size_t curveCount = q_EC_get_builtin_curves(NULL, 0); -+ const size_t curveCount = q_EC_get_builtin_curves(nullptr, 0); - - QVarLengthArray builtinCurves(static_cast(curveCount)); - -@@ -698,13 +510,14 @@ QList QSslSocketPrivate::systemCaCertificates() - if (ptrCertOpenSystemStoreW && ptrCertFindCertificateInStore && ptrCertCloseStore) { - HCERTSTORE hSystemStore; - hSystemStore = ptrCertOpenSystemStoreW(0, L"ROOT"); -- if(hSystemStore) { -- PCCERT_CONTEXT pc = NULL; -- while(1) { -- pc = ptrCertFindCertificateInStore( hSystemStore, X509_ASN_ENCODING, 0, CERT_FIND_ANY, NULL, pc); -- if(!pc) -+ if (hSystemStore) { -+ PCCERT_CONTEXT pc = nullptr; -+ while (1) { -+ pc = ptrCertFindCertificateInStore(hSystemStore, X509_ASN_ENCODING, 0, CERT_FIND_ANY, nullptr, pc); -+ if (!pc) - break; -- QByteArray der((const char *)(pc->pbCertEncoded), static_cast(pc->cbCertEncoded)); -+ QByteArray der(reinterpret_cast(pc->pbCertEncoded), -+ static_cast(pc->cbCertEncoded)); - QSslCertificate cert(der, QSsl::Der); - systemCerts.append(cert); - } -@@ -1504,14 +1317,8 @@ QSslCipher QSslSocketBackendPrivate::sessionCipher() const - { - if (!ssl) - return QSslCipher(); --#if OPENSSL_VERSION_NUMBER >= 0x10000000L -- // FIXME This is fairly evil, but needed to keep source level compatibility -- // with the OpenSSL 0.9.x implementation at maximum -- some other functions -- // don't take a const SSL_CIPHER* when they should -- SSL_CIPHER *sessionCipher = const_cast(q_SSL_get_current_cipher(ssl)); --#else -- SSL_CIPHER *sessionCipher = q_SSL_get_current_cipher(ssl); --#endif -+ -+ const SSL_CIPHER *sessionCipher = q_SSL_get_current_cipher(ssl); - return sessionCipher ? QSslCipher_from_SSL_CIPHER(sessionCipher) : QSslCipher(); - } - -@@ -1537,112 +1344,6 @@ QSsl::SslProtocol QSslSocketBackendPrivate::sessionProtocol() const - return QSsl::UnknownProtocol; - } - --void QSslSocketBackendPrivate::continueHandshake() --{ -- Q_Q(QSslSocket); -- // if we have a max read buffer size, reset the plain socket's to match -- if (readBufferMaxSize) -- plainSocket->setReadBufferSize(readBufferMaxSize); -- -- if (q_SSL_ctrl((ssl), SSL_CTRL_GET_SESSION_REUSED, 0, NULL)) -- configuration.peerSessionShared = true; -- --#ifdef QT_DECRYPT_SSL_TRAFFIC -- if (ssl->session && ssl->s3) { -- const char *mk = reinterpret_cast(ssl->session->master_key); -- QByteArray masterKey(mk, ssl->session->master_key_length); -- const char *random = reinterpret_cast(ssl->s3->client_random); -- QByteArray clientRandom(random, SSL3_RANDOM_SIZE); -- -- // different format, needed for e.g. older Wireshark versions: --// const char *sid = reinterpret_cast(ssl->session->session_id); --// QByteArray sessionID(sid, ssl->session->session_id_length); --// QByteArray debugLineRSA("RSA Session-ID:"); --// debugLineRSA.append(sessionID.toHex().toUpper()); --// debugLineRSA.append(" Master-Key:"); --// debugLineRSA.append(masterKey.toHex().toUpper()); --// debugLineRSA.append("\n"); -- -- QByteArray debugLineClientRandom("CLIENT_RANDOM "); -- debugLineClientRandom.append(clientRandom.toHex().toUpper()); -- debugLineClientRandom.append(" "); -- debugLineClientRandom.append(masterKey.toHex().toUpper()); -- debugLineClientRandom.append("\n"); -- -- QString sslKeyFile = QDir::tempPath() + QLatin1String("/qt-ssl-keys"); -- QFile file(sslKeyFile); -- if (!file.open(QIODevice::Append)) -- qCWarning(lcSsl) << "could not open file" << sslKeyFile << "for appending"; -- if (!file.write(debugLineClientRandom)) -- qCWarning(lcSsl) << "could not write to file" << sslKeyFile; -- file.close(); -- } else { -- qCWarning(lcSsl, "could not decrypt SSL traffic"); -- } --#endif -- -- // Cache this SSL session inside the QSslContext -- if (!(configuration.sslOptions & QSsl::SslOptionDisableSessionSharing)) { -- if (!sslContextPointer->cacheSession(ssl)) { -- sslContextPointer.clear(); // we could not cache the session -- } else { -- // Cache the session for permanent usage as well -- if (!(configuration.sslOptions & QSsl::SslOptionDisableSessionPersistence)) { -- if (!sslContextPointer->sessionASN1().isEmpty()) -- configuration.sslSession = sslContextPointer->sessionASN1(); -- configuration.sslSessionTicketLifeTimeHint = sslContextPointer->sessionTicketLifeTimeHint(); -- } -- } -- } -- --#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) -- -- configuration.nextProtocolNegotiationStatus = sslContextPointer->npnContext().status; -- if (sslContextPointer->npnContext().status == QSslConfiguration::NextProtocolNegotiationUnsupported) { -- // we could not agree -> be conservative and use HTTP/1.1 -- configuration.nextNegotiatedProtocol = QByteArrayLiteral("http/1.1"); -- } else { -- const unsigned char *proto = 0; -- unsigned int proto_len = 0; --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -- if (q_SSLeay() >= 0x10002000L) { -- q_SSL_get0_alpn_selected(ssl, &proto, &proto_len); -- if (proto_len && mode == QSslSocket::SslClientMode) { -- // Client does not have a callback that sets it ... -- configuration.nextProtocolNegotiationStatus = QSslConfiguration::NextProtocolNegotiationNegotiated; -- } -- } -- -- if (!proto_len) { // Test if NPN was more lucky ... --#else -- { --#endif -- q_SSL_get0_next_proto_negotiated(ssl, &proto, &proto_len); -- } -- -- if (proto_len) -- configuration.nextNegotiatedProtocol = QByteArray(reinterpret_cast(proto), proto_len); -- else -- configuration.nextNegotiatedProtocol.clear(); -- } --#endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... -- --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -- if (q_SSLeay() >= 0x10002000L && mode == QSslSocket::SslClientMode) { -- EVP_PKEY *key; -- if (q_SSL_get_server_tmp_key(ssl, &key)) -- configuration.ephemeralServerKey = QSslKey(key, QSsl::PublicKey); -- } --#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L ... -- -- connectionEncrypted = true; -- emit q->encrypted(); -- if (autoStartHandshake && pendingClose) { -- pendingClose = false; -- q->disconnectFromHost(); -- } --} -- - QList QSslSocketBackendPrivate::STACKOFX509_to_QSslCertificates(STACK_OF(X509) *x509) - { - ensureInitialized(); -@@ -1696,12 +1397,12 @@ QList QSslSocketBackendPrivate::verify(const QList & - QMutexLocker sslErrorListMutexLocker(&_q_sslErrorList()->mutex); - - // Register a custom callback to get all verification errors. -- X509_STORE_set_verify_cb_func(certStore, q_X509Callback); -+ q_X509_STORE_set_verify_cb(certStore, q_X509Callback); - - // Build the chain of intermediate certificates - STACK_OF(X509) *intermediates = 0; - if (certificateChain.length() > 1) { -- intermediates = (STACK_OF(X509) *) q_sk_new_null(); -+ intermediates = (STACK_OF(X509) *) q_OPENSSL_sk_new_null(); - - if (!intermediates) { - q_X509_STORE_free(certStore); -@@ -1715,11 +1416,8 @@ QList QSslSocketBackendPrivate::verify(const QList & - first = false; - continue; - } --#if OPENSSL_VERSION_NUMBER >= 0x10000000L -- q_sk_push( (_STACK *)intermediates, reinterpret_cast(cert.handle())); --#else -- q_sk_push( (STACK *)intermediates, reinterpret_cast(cert.handle())); --#endif -+ -+ q_OPENSSL_sk_push((OPENSSL_STACK *)intermediates, reinterpret_cast(cert.handle())); - } - } - -@@ -1743,11 +1441,7 @@ QList QSslSocketBackendPrivate::verify(const QList & - (void) q_X509_verify_cert(storeContext); - - q_X509_STORE_CTX_free(storeContext); --#if OPENSSL_VERSION_NUMBER >= 0x10000000L -- q_sk_free( (_STACK *) intermediates); --#else -- q_sk_free( (STACK *) intermediates); --#endif -+ q_OPENSSL_sk_free((OPENSSL_STACK *)intermediates); - - // Now process the errors - const auto errorList = std::move(_q_sslErrorList()->errors); -@@ -1821,7 +1515,8 @@ bool QSslSocketBackendPrivate::importPkcs12(QIODevice *device, - // Convert to Qt types - if (!key->d->fromEVP_PKEY(pkey)) { - qCWarning(lcSsl, "Unable to convert private key"); -- q_sk_pop_free(reinterpret_cast(ca), reinterpret_cast(q_sk_free)); -+ q_OPENSSL_sk_pop_free(reinterpret_cast(ca), -+ reinterpret_cast(q_OPENSSL_sk_free)); - q_X509_free(x509); - q_EVP_PKEY_free(pkey); - q_PKCS12_free(p12); -@@ -1836,7 +1531,11 @@ bool QSslSocketBackendPrivate::importPkcs12(QIODevice *device, - *caCertificates = QSslSocketBackendPrivate::STACKOFX509_to_QSslCertificates(ca); - - // Clean up -- q_sk_pop_free(reinterpret_cast(ca), reinterpret_cast(q_sk_free)); -+ // TODO: verify ASAP, in the past we had sk_pop_free with q_OPENSSL_sk_free -+ // which seems to be blatantly wrong and even crashes with 1.1. -+ q_OPENSSL_sk_pop_free(reinterpret_cast(ca), -+ reinterpret_cast(q_X509_free)); -+ - q_X509_free(x509); - q_EVP_PKEY_free(pkey); - q_PKCS12_free(p12); -diff --git a/qtbase/src/network/ssl/qsslsocket_openssl11.cpp b/qtbase/src/network/ssl/qsslsocket_openssl11.cpp -new file mode 100644 -index 0000000000..b6d18943a5 ---- /dev/null -+++ b/qtbase/src/network/ssl/qsslsocket_openssl11.cpp -@@ -0,0 +1,285 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2017 The Qt Company Ltd. -+** Copyright (C) 2014 Governikus GmbH & Co. KG -+** Copyright (C) 2016 Richard J. Moore -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the QtNetwork module of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+/**************************************************************************** -+** -+** In addition, as a special exception, the copyright holders listed above give -+** permission to link the code of its release of Qt with the OpenSSL project's -+** "OpenSSL" library (or modified versions of the "OpenSSL" library that use the -+** same license as the original version), and distribute the linked executables. -+** -+** You must comply with the GNU General Public License version 2 in all -+** respects for all of the code used other than the "OpenSSL" code. If you -+** modify this file, you may extend this exception to your version of the file, -+** but you are not obligated to do so. If you do not wish to do so, delete -+** this exception statement from your version of this file. -+** -+****************************************************************************/ -+ -+//#define QT_DECRYPT_SSL_TRAFFIC -+ -+#include "qssl_p.h" -+#include "qsslsocket_openssl_p.h" -+#include "qsslsocket_openssl_symbols_p.h" -+#include "qsslsocket.h" -+#include "qsslkey.h" -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+QT_BEGIN_NAMESPACE -+ -+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, qt_opensslInitMutex, (QMutex::Recursive)) -+ -+/*! -+ \internal -+*/ -+void QSslSocketPrivate::deinitialize() -+{ -+ // This function exists only for compatibility with the pre-11 code, -+ // where deinitialize() actually does some cleanup. To be discarded -+ // once we retire < 1.1. -+} -+ -+bool QSslSocketPrivate::ensureLibraryLoaded() -+{ -+ if (!q_resolveOpenSslSymbols()) -+ return false; -+ -+ const QMutexLocker locker(qt_opensslInitMutex); -+ -+ if (!s_libraryLoaded) { -+ s_libraryLoaded = true; -+ -+ // Initialize OpenSSL. -+ if (q_OPENSSL_init_ssl(0, nullptr) != 1) -+ return false; -+ q_SSL_load_error_strings(); -+ q_OpenSSL_add_all_algorithms(); -+ -+ QSslSocketBackendPrivate::s_indexForSSLExtraData -+ = q_CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL, 0L, nullptr, nullptr, -+ nullptr, nullptr); -+ -+ // Initialize OpenSSL's random seed. -+ if (!q_RAND_status()) { -+ qWarning("Random number generator not seeded, disabling SSL support"); -+ return false; -+ } -+ } -+ return true; -+} -+ -+void QSslSocketPrivate::ensureCiphersAndCertsLoaded() -+{ -+ const QMutexLocker locker(qt_opensslInitMutex); -+ -+ if (s_loadedCiphersAndCerts) -+ return; -+ s_loadedCiphersAndCerts = true; -+ -+ resetDefaultCiphers(); -+ resetDefaultEllipticCurves(); -+ -+#if QT_CONFIG(library) -+ //load symbols needed to receive certificates from system store -+#if defined(Q_OS_WIN) -+ HINSTANCE hLib = LoadLibraryW(L"Crypt32"); -+ if (hLib) { -+ ptrCertOpenSystemStoreW = (PtrCertOpenSystemStoreW)GetProcAddress(hLib, "CertOpenSystemStoreW"); -+ ptrCertFindCertificateInStore = (PtrCertFindCertificateInStore)GetProcAddress(hLib, "CertFindCertificateInStore"); -+ ptrCertCloseStore = (PtrCertCloseStore)GetProcAddress(hLib, "CertCloseStore"); -+ if (!ptrCertOpenSystemStoreW || !ptrCertFindCertificateInStore || !ptrCertCloseStore) -+ qCWarning(lcSsl, "could not resolve symbols in crypt32 library"); // should never happen -+ } else { -+ qCWarning(lcSsl, "could not load crypt32 library"); // should never happen -+ } -+#elif defined(Q_OS_QNX) -+ s_loadRootCertsOnDemand = true; -+#elif defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) -+ // check whether we can enable on-demand root-cert loading (i.e. check whether the sym links are there) -+ QList dirs = unixRootCertDirectories(); -+ QStringList symLinkFilter; -+ symLinkFilter << QLatin1String("[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].[0-9]"); -+ for (int a = 0; a < dirs.count(); ++a) { -+ QDirIterator iterator(QLatin1String(dirs.at(a)), symLinkFilter, QDir::Files); -+ if (iterator.hasNext()) { -+ s_loadRootCertsOnDemand = true; -+ break; -+ } -+ } -+#endif -+#endif // QT_CONFIG(library) -+ // if on-demand loading was not enabled, load the certs now -+ if (!s_loadRootCertsOnDemand) -+ setDefaultCaCertificates(systemCaCertificates()); -+#ifdef Q_OS_WIN -+ //Enabled for fetching additional root certs from windows update on windows 6+ -+ //This flag is set false by setDefaultCaCertificates() indicating the app uses -+ //its own cert bundle rather than the system one. -+ //Same logic that disables the unix on demand cert loading. -+ //Unlike unix, we do preload the certificates from the cert store. -+ if ((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) >= QSysInfo::WV_6_0) -+ s_loadRootCertsOnDemand = true; -+#endif -+} -+ -+long QSslSocketPrivate::sslLibraryVersionNumber() -+{ -+ if (!supportsSsl()) -+ return 0; -+ -+ return q_OpenSSL_version_num(); -+} -+ -+QString QSslSocketPrivate::sslLibraryVersionString() -+{ -+ if (!supportsSsl()) -+ return QString(); -+ -+ const char *versionString = q_OpenSSL_version(OPENSSL_VERSION); -+ if (!versionString) -+ return QString(); -+ -+ return QString::fromLatin1(versionString); -+} -+ -+void QSslSocketBackendPrivate::continueHandshake() -+{ -+ Q_Q(QSslSocket); -+ // if we have a max read buffer size, reset the plain socket's to match -+ if (readBufferMaxSize) -+ plainSocket->setReadBufferSize(readBufferMaxSize); -+ -+ if (q_SSL_session_reused(ssl)) -+ configuration.peerSessionShared = true; -+ -+#ifdef QT_DECRYPT_SSL_TRAFFIC -+ if (q_SSL_get_session(ssl)) { -+ size_t master_key_len = q_SSL_SESSION_get_master_key(q_SSL_get_session(ssl), 0, 0); -+ size_t client_random_len = q_SSL_get_client_random(ssl, 0, 0); -+ QByteArray masterKey(int(master_key_len), 0); // Will not overflow -+ QByteArray clientRandom(int(client_random_len), 0); // Will not overflow -+ -+ q_SSL_SESSION_get_master_key(q_SSL_get_session(ssl), -+ reinterpret_cast(masterKey.data()), -+ masterKey.size()); -+ q_SSL_get_client_random(ssl, reinterpret_cast(clientRandom.data()), -+ clientRandom.size()); -+ -+ QByteArray debugLineClientRandom("CLIENT_RANDOM "); -+ debugLineClientRandom.append(clientRandom.toHex().toUpper()); -+ debugLineClientRandom.append(" "); -+ debugLineClientRandom.append(masterKey.toHex().toUpper()); -+ debugLineClientRandom.append("\n"); -+ -+ QString sslKeyFile = QDir::tempPath() + QLatin1String("/qt-ssl-keys"); -+ QFile file(sslKeyFile); -+ if (!file.open(QIODevice::Append)) -+ qCWarning(lcSsl) << "could not open file" << sslKeyFile << "for appending"; -+ if (!file.write(debugLineClientRandom)) -+ qCWarning(lcSsl) << "could not write to file" << sslKeyFile; -+ file.close(); -+ } else { -+ qCWarning(lcSsl, "could not decrypt SSL traffic"); -+ } -+#endif -+ -+ // Cache this SSL session inside the QSslContext -+ if (!(configuration.sslOptions & QSsl::SslOptionDisableSessionSharing)) { -+ if (!sslContextPointer->cacheSession(ssl)) { -+ sslContextPointer.clear(); // we could not cache the session -+ } else { -+ // Cache the session for permanent usage as well -+ if (!(configuration.sslOptions & QSsl::SslOptionDisableSessionPersistence)) { -+ if (!sslContextPointer->sessionASN1().isEmpty()) -+ configuration.sslSession = sslContextPointer->sessionASN1(); -+ configuration.sslSessionTicketLifeTimeHint = sslContextPointer->sessionTicketLifeTimeHint(); -+ } -+ } -+ } -+ -+#if !defined(OPENSSL_NO_NEXTPROTONEG) -+ -+ configuration.nextProtocolNegotiationStatus = sslContextPointer->npnContext().status; -+ if (sslContextPointer->npnContext().status == QSslConfiguration::NextProtocolNegotiationUnsupported) { -+ // we could not agree -> be conservative and use HTTP/1.1 -+ configuration.nextNegotiatedProtocol = QByteArrayLiteral("http/1.1"); -+ } else { -+ const unsigned char *proto = 0; -+ unsigned int proto_len = 0; -+ -+ q_SSL_get0_alpn_selected(ssl, &proto, &proto_len); -+ if (proto_len && mode == QSslSocket::SslClientMode) { -+ // Client does not have a callback that sets it ... -+ configuration.nextProtocolNegotiationStatus = QSslConfiguration::NextProtocolNegotiationNegotiated; -+ } -+ -+ if (!proto_len) { // Test if NPN was more lucky ... -+ q_SSL_get0_next_proto_negotiated(ssl, &proto, &proto_len); -+ } -+ -+ if (proto_len) -+ configuration.nextNegotiatedProtocol = QByteArray(reinterpret_cast(proto), proto_len); -+ else -+ configuration.nextNegotiatedProtocol.clear(); -+ } -+#endif // !defined(OPENSSL_NO_NEXTPROTONEG) -+ -+ if (mode == QSslSocket::SslClientMode) { -+ EVP_PKEY *key; -+ if (q_SSL_get_server_tmp_key(ssl, &key)) -+ configuration.ephemeralServerKey = QSslKey(key, QSsl::PublicKey); -+ } -+ -+ connectionEncrypted = true; -+ emit q->encrypted(); -+ if (autoStartHandshake && pendingClose) { -+ pendingClose = false; -+ q->disconnectFromHost(); -+ } -+} -+ -+QT_END_NAMESPACE -diff --git a/qtbase/src/network/ssl/qsslsocket_openssl11_symbols_p.h b/qtbase/src/network/ssl/qsslsocket_openssl11_symbols_p.h -new file mode 100644 -index 0000000000..2980b3d23e ---- /dev/null -+++ b/qtbase/src/network/ssl/qsslsocket_openssl11_symbols_p.h -@@ -0,0 +1,132 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2017 The Qt Company Ltd. -+** Copyright (C) 2014 BlackBerry Limited. All rights reserved. -+** Copyright (C) 2016 Richard J. Moore -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the QtNetwork module of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+/**************************************************************************** -+** -+** In addition, as a special exception, the copyright holders listed above give -+** permission to link the code of its release of Qt with the OpenSSL project's -+** "OpenSSL" library (or modified versions of the "OpenSSL" library that use the -+** same license as the original version), and distribute the linked executables. -+** -+** You must comply with the GNU General Public License version 2 in all -+** respects for all of the code used other than the "OpenSSL" code. If you -+** modify this file, you may extend this exception to your version of the file, -+** but you are not obligated to do so. If you do not wish to do so, delete -+** this exception statement from your version of this file. -+** -+****************************************************************************/ -+ -+#ifndef QSSLSOCKET_OPENSSL11_SYMBOLS_P_H -+#define QSSLSOCKET_OPENSSL11_SYMBOLS_P_H -+ -+// -+// W A R N I N G -+// ------------- -+// -+// This file is not part of the Qt API. It exists purely as an -+// implementation detail. This header file may change from version to -+// version without notice, or even be removed. -+// -+// We mean it. -+// -+ -+// Note: this file does not have QT_BEGIN_NAMESPACE/QT_END_NAMESPACE, it's done -+// in qsslsocket_openssl_symbols_p.h. -+ -+#ifndef QSSLSOCKET_OPENSSL_SYMBOLS_P_H -+#error "You are not supposed to use this header file, include qsslsocket_openssl_symbols_p.h instead" -+#endif -+ -+const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x); -+ -+Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); -+Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); -+ -+int q_DSA_bits(DSA *a); -+int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c); -+int q_EVP_PKEY_base_id(EVP_PKEY *a); -+int q_RSA_bits(RSA *a); -+int q_OPENSSL_sk_num(OPENSSL_STACK *a); -+void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *)); -+OPENSSL_STACK *q_OPENSSL_sk_new_null(); -+void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data); -+void q_OPENSSL_sk_free(OPENSSL_STACK *a); -+void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b); -+int q_SSL_session_reused(SSL *a); -+unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op); -+int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); -+size_t q_SSL_get_client_random(SSL *a, unsigned char *out, size_t outlen); -+size_t q_SSL_SESSION_get_master_key(const SSL_SESSION *session, unsigned char *out, size_t outlen); -+int q_CRYPTO_get_ex_new_index(int class_index, long argl, void *argp, CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); -+const SSL_METHOD *q_TLS_method(); -+const SSL_METHOD *q_TLS_client_method(); -+const SSL_METHOD *q_TLS_server_method(); -+ASN1_TIME *q_X509_getm_notBefore(X509 *a); -+ASN1_TIME *q_X509_getm_notAfter(X509 *a); -+ -+long q_X509_get_version(X509 *a); -+EVP_PKEY *q_X509_get_pubkey(X509 *a); -+void q_X509_STORE_set_verify_cb(X509_STORE *ctx, X509_STORE_CTX_verify_cb verify_cb); -+STACK_OF(X509) *q_X509_STORE_CTX_get0_chain(X509_STORE_CTX *ctx); -+void q_DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g); -+int q_DH_bits(DH *dh); -+ -+# define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \ -+ | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL) -+ -+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st) -+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i) -+ -+#define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ -+ | OPENSSL_INIT_ADD_ALL_DIGESTS \ -+ | OPENSSL_INIT_LOAD_CONFIG, NULL) -+#define q_OPENSSL_add_all_algorithms_noconf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ -+ | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL) -+ -+int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); -+void q_CRYPTO_free(void *str, const char *file, int line); -+ -+long q_OpenSSL_version_num(); -+const char *q_OpenSSL_version(int type); -+ -+unsigned long q_SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *session); -+ -+#endif -diff --git a/qtbase/src/network/ssl/qsslsocket_openssl_p.h b/qtbase/src/network/ssl/qsslsocket_openssl_p.h -index b2adb3e547..7f9e884045 100644 ---- a/qtbase/src/network/ssl/qsslsocket_openssl_p.h -+++ b/qtbase/src/network/ssl/qsslsocket_openssl_p.h -@@ -1,6 +1,6 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. -+** Copyright (C) 2017 The Qt Company Ltd. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtNetwork module of the Qt Toolkit. -@@ -98,8 +98,8 @@ - #include - #include - --#if OPENSSL_VERSION_NUMBER >= 0x10000000L --typedef _STACK STACK; -+#if QT_CONFIG(opensslv11) -+#include - #endif - - QT_BEGIN_NAMESPACE -@@ -151,7 +151,7 @@ public: - #endif - - Q_AUTOTEST_EXPORT static long setupOpenSslOptions(QSsl::SslProtocol protocol, QSsl::SslOptions sslOptions); -- static QSslCipher QSslCipher_from_SSL_CIPHER(SSL_CIPHER *cipher); -+ static QSslCipher QSslCipher_from_SSL_CIPHER(const SSL_CIPHER *cipher); - static QList STACKOFX509_to_QSslCertificates(STACK_OF(X509) *x509); - static QList verify(const QList &certificateChain, const QString &hostName); - static QString getErrorsFromOpenSsl(); -diff --git a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -index c344a94427..0ef8bf6b5e 100644 ---- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -+++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -1,7 +1,8 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. -+** Copyright (C) 2017 The Qt Company Ltd. - ** Copyright (C) 2014 BlackBerry Limited. All rights reserved. -+** Copyright (C) 2016 Richard J. Moore - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the QtNetwork module of the Qt Toolkit. -@@ -136,49 +137,195 @@ void qsslSocketCannotResolveSymbolWarning(const char *functionName) - - #endif // QT_LINKED_OPENSSL - -+#if QT_CONFIG(opensslv11) -+ -+// Below are the functions first introduced in version 1.1: -+ -+DEFINEFUNC(const unsigned char *, ASN1_STRING_get0_data, const ASN1_STRING *a, a, return 0, return) -+DEFINEFUNC2(int, OPENSSL_init_ssl, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return 0, return) -+DEFINEFUNC2(int, OPENSSL_init_crypto, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return 0, return) -+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return) -+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) -+DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) -+DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return) -+DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return) -+DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return) -+DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return) -+DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return) -+DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG) -+DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG) -+DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG) -+DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return 0, return) -+DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) -+DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return) -+DEFINEFUNC3(size_t, SSL_get_client_random, SSL *a, a, unsigned char *out, out, size_t outlen, outlen, return 0, return) -+DEFINEFUNC3(size_t, SSL_SESSION_get_master_key, const SSL_SESSION *ses, ses, unsigned char *out, out, size_t outlen, outlen, return 0, return) -+DEFINEFUNC6(int, CRYPTO_get_ex_new_index, int class_index, class_index, long argl, argl, void *argp, argp, CRYPTO_EX_new *new_func, new_func, CRYPTO_EX_dup *dup_func, dup_func, CRYPTO_EX_free *free_func, free_func, return -1, return) -+ -+DEFINEFUNC(const SSL_METHOD *, TLS_method, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(const SSL_METHOD *, TLS_client_method, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(const SSL_METHOD *, TLS_server_method, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(ASN1_TIME *, X509_getm_notBefore, X509 *a, a, return 0, return) -+DEFINEFUNC(ASN1_TIME *, X509_getm_notAfter, X509 *a, a, return 0, return) -+DEFINEFUNC(long, X509_get_version, X509 *a, a, return -1, return) -+DEFINEFUNC(EVP_PKEY *, X509_get_pubkey, X509 *a, a, return 0, return) -+DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_verify_cb verify_cb, verify_cb, return, DUMMYARG) -+DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return 0, return) -+DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) -+DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return) -+DEFINEFUNC(const char *, OpenSSL_version, int a, a, return 0, return) -+DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return) -+DEFINEFUNC4(void, DH_get0_pqg, const DH *dh, dh, const BIGNUM **p, p, const BIGNUM **q, q, const BIGNUM **g, g, return, DUMMYARG) -+DEFINEFUNC(int, DH_bits, DH *dh, dh, return 0, return) -+ -+#else // QT_CONFIG(opensslv11) -+ -+// Functions below are either deprecated or removed in OpenSSL >= 1.1: -+ -+DEFINEFUNC(unsigned char *, ASN1_STRING_data, ASN1_STRING *a, a, return 0, return) -+ - #ifdef SSLEAY_MACROS - DEFINEFUNC3(void *, ASN1_dup, i2d_of_void *a, a, d2i_of_void *b, b, char *c, c, return 0, return) - #endif -+DEFINEFUNC2(BIO *, BIO_new_file, const char *filename, filename, const char *mode, mode, return 0, return) -+DEFINEFUNC(void, ERR_clear_error, DUMMYARG, DUMMYARG, return, DUMMYARG) -+DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return) -+DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) -+DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG) -+DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG) -+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) -+DEFINEFUNC(unsigned long, ERR_peek_last_error, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(void, ERR_free_strings, void, DUMMYARG, return, DUMMYARG) -+DEFINEFUNC(void, EVP_CIPHER_CTX_cleanup, EVP_CIPHER_CTX *a, a, return, DUMMYARG) -+DEFINEFUNC(void, EVP_CIPHER_CTX_init, EVP_CIPHER_CTX *a, a, return, DUMMYARG) -+ -+#ifdef SSLEAY_MACROS -+DEFINEFUNC6(void *, PEM_ASN1_read_bio, d2i_of_void *a, a, const char *b, b, BIO *c, c, void **d, d, pem_password_cb *e, e, void *f, f, return 0, return) -+DEFINEFUNC6(void *, PEM_ASN1_write_bio, d2i_of_void *a, a, const char *b, b, BIO *c, c, void **d, d, pem_password_cb *e, e, void *f, f, return 0, return) -+#endif // SSLEAY_MACROS -+ -+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) -+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG) -+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG) -+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return 0, return) -+#else -+DEFINEFUNC(STACK *, sk_new_null, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC2(void, sk_push, STACK *a, a, char *b, b, return, DUMMYARG) -+DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG) -+DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return 0, return) -+#endif // OPENSSL_VERSION_NUMBER >= 0x10000000L -+ -+DEFINEFUNC(int, SSL_library_init, void, DUMMYARG, return -1, return) -+DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG) -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+DEFINEFUNC5(int, SSL_get_ex_new_index, long argl, argl, void *argp, argp, CRYPTO_EX_new *new_func, new_func, CRYPTO_EX_dup *dup_func, dup_func, CRYPTO_EX_free *free_func, free_func, return -1, return) -+#endif // OPENSSL_VERSION_NUMBER >= 0x10001000L -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+#ifndef OPENSSL_NO_SSL2 -+DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+#ifndef OPENSSL_NO_SSL3_METHOD -+DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+DEFINEFUNC(const SSL_METHOD *, TLSv1_1_client_method, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(const SSL_METHOD *, TLSv1_2_client_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+#ifndef OPENSSL_NO_SSL2 -+DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+#ifndef OPENSSL_NO_SSL3_METHOD -+DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+DEFINEFUNC(const SSL_METHOD *, TLSv1_1_server_method, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(const SSL_METHOD *, TLSv1_2_server_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+#else -+#ifndef OPENSSL_NO_SSL2 -+DEFINEFUNC(SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+#ifndef OPENSSL_NO_SSL3_METHOD -+DEFINEFUNC(SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+DEFINEFUNC(SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) -+#ifndef OPENSSL_NO_SSL2 -+DEFINEFUNC(SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+#ifndef OPENSSL_NO_SSL3_METHOD -+DEFINEFUNC(SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+DEFINEFUNC(SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif -+ -+DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return 0, return) -+ -+#ifdef SSLEAY_MACROS -+DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return) -+DEFINEFUNC2(int, i2d_RSAPrivateKey, const RSA *a, a, unsigned char **b, b, return -1, return) -+#ifndef OPENSSL_NO_EC -+DEFINEFUNC2(int, i2d_ECPrivateKey, const EC_KEY *a, a, unsigned char **b, b, return -1, return) -+#endif -+DEFINEFUNC3(RSA *, d2i_RSAPrivateKey, RSA **a, a, unsigned char **b, b, long c, c, return 0, return) -+DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsigned char **b, b, long c, c, return 0, return) -+#ifndef OPENSSL_NO_EC -+DEFINEFUNC3(EC_KEY *, d2i_ECPrivateKey, EC_KEY **a, a, unsigned char **b, b, long c, c, return 0, return) -+#endif -+#endif -+DEFINEFUNC(char *, CONF_get1_default_config_file, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(void, OPENSSL_add_all_algorithms_noconf, void, DUMMYARG, return, DUMMYARG) -+DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG) -+DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return) -+DEFINEFUNC(const char *, SSLeay_version, int a, a, return 0, return) -+ -+#endif // QT_CONFIG(opensslv11) -+ - DEFINEFUNC(long, ASN1_INTEGER_get, ASN1_INTEGER *a, a, return 0, return) --DEFINEFUNC(unsigned char *, ASN1_STRING_data, ASN1_STRING *a, a, return 0, return) - DEFINEFUNC(int, ASN1_STRING_length, ASN1_STRING *a, a, return 0, return) --DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return); -+DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return) - DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return) - DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return) --DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return) - DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return 0, return) - DEFINEFUNC3(int, BIO_read, BIO *a, a, void *b, b, int c, c, return -1, return) --DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) -+ - DEFINEFUNC3(int, BIO_write, BIO *a, a, const void *b, b, int c, c, return -1, return) - DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return) --#if OPENSSL_VERSION_NUMBER >= 0x10100000L --DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) --#endif - DEFINEFUNC2(BN_ULONG, BN_mod_word, const BIGNUM *a, a, BN_ULONG w, w, return static_cast(-1), return) - #ifndef OPENSSL_NO_EC - DEFINEFUNC(const EC_GROUP*, EC_KEY_get0_group, const EC_KEY* k, k, return 0, return) - DEFINEFUNC(int, EC_GROUP_get_degree, const EC_GROUP* g, g, return 0, return) - #endif --DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG) --DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG) --DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) - DEFINEFUNC(DSA *, DSA_new, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(void, DSA_free, DSA *a, a, return, DUMMYARG) - DEFINEFUNC3(X509 *, d2i_X509, X509 **a, a, const unsigned char **b, b, long c, c, return 0, return) - DEFINEFUNC2(char *, ERR_error_string, unsigned long a, a, char *b, b, return 0, return) - DEFINEFUNC(unsigned long, ERR_get_error, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC(void, ERR_free_strings, void, DUMMYARG, return, DUMMYARG) --DEFINEFUNC(void, EVP_CIPHER_CTX_cleanup, EVP_CIPHER_CTX *a, a, return, DUMMYARG) --DEFINEFUNC(void, EVP_CIPHER_CTX_init, EVP_CIPHER_CTX *a, a, return, DUMMYARG) --DEFINEFUNC4(int, EVP_CIPHER_CTX_ctrl, EVP_CIPHER_CTX *ctx, ctx, int type, type, int arg, arg, void *ptr, ptr, return 0, return); -+DEFINEFUNC(EVP_CIPHER_CTX *, EVP_CIPHER_CTX_new, void, DUMMYARG, return 0, return) -+DEFINEFUNC(void, EVP_CIPHER_CTX_free, EVP_CIPHER_CTX *a, a, return, DUMMYARG) -+DEFINEFUNC4(int, EVP_CIPHER_CTX_ctrl, EVP_CIPHER_CTX *ctx, ctx, int type, type, int arg, arg, void *ptr, ptr, return 0, return) - DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int keylen, keylen, return 0, return) --DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return); --DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return); --DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return); -+DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return) -+DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return) -+DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return) -+DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return) - DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(const EVP_CIPHER *, EVP_des_ede3_cbc, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(const EVP_CIPHER *, EVP_rc2_cbc, DUMMYARG, DUMMYARG, return 0, return) -+DEFINEFUNC(const EVP_MD *, EVP_sha1, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC3(int, EVP_PKEY_assign, EVP_PKEY *a, a, int b, b, char *c, c, return -1, return) - DEFINEFUNC2(int, EVP_PKEY_set1_RSA, EVP_PKEY *a, a, RSA *b, b, return -1, return) - DEFINEFUNC2(int, EVP_PKEY_set1_DSA, EVP_PKEY *a, a, DSA *b, b, return -1, return) -@@ -202,10 +349,8 @@ DEFINEFUNC3(int, i2t_ASN1_OBJECT, char *a, a, int b, b, ASN1_OBJECT *c, c, retur - DEFINEFUNC4(int, OBJ_obj2txt, char *a, a, int b, b, ASN1_OBJECT *c, c, int d, d, return -1, return) - - DEFINEFUNC(int, OBJ_obj2nid, const ASN1_OBJECT *a, a, return NID_undef, return) --#ifdef SSLEAY_MACROS --DEFINEFUNC6(void *, PEM_ASN1_read_bio, d2i_of_void *a, a, const char *b, b, BIO *c, c, void **d, d, pem_password_cb *e, e, void *f, f, return 0, return) --DEFINEFUNC6(void *, PEM_ASN1_write_bio, d2i_of_void *a, a, const char *b, b, BIO *c, c, void **d, d, pem_password_cb *e, e, void *f, f, return 0, return) --#else -+ -+#ifndef SSLEAY_MACROS - DEFINEFUNC4(EVP_PKEY *, PEM_read_bio_PrivateKey, BIO *a, a, EVP_PKEY **b, b, pem_password_cb *c, c, void *d, d, return 0, return) - DEFINEFUNC4(DSA *, PEM_read_bio_DSAPrivateKey, BIO *a, a, DSA **b, b, pem_password_cb *c, c, void *d, d, return 0, return) - DEFINEFUNC4(RSA *, PEM_read_bio_RSAPrivateKey, BIO *a, a, RSA **b, b, pem_password_cb *c, c, void *d, d, return 0, return) -@@ -218,7 +363,7 @@ DEFINEFUNC7(int, PEM_write_bio_RSAPrivateKey, BIO *a, a, RSA *b, b, const EVP_CI - #ifndef OPENSSL_NO_EC - DEFINEFUNC7(int, PEM_write_bio_ECPrivateKey, BIO *a, a, EC_KEY *b, b, const EVP_CIPHER *c, c, unsigned char *d, d, int e, e, pem_password_cb *f, f, void *g, g, return 0, return) - #endif --#endif -+#endif // !SSLEAY_MACROS - DEFINEFUNC4(EVP_PKEY *, PEM_read_bio_PUBKEY, BIO *a, a, EVP_PKEY **b, b, pem_password_cb *c, c, void *d, d, return 0, return) - DEFINEFUNC4(DSA *, PEM_read_bio_DSA_PUBKEY, BIO *a, a, DSA **b, b, pem_password_cb *c, c, void *d, d, return 0, return) - DEFINEFUNC4(RSA *, PEM_read_bio_RSA_PUBKEY, BIO *a, a, RSA **b, b, pem_password_cb *c, c, void *d, d, return 0, return) -@@ -234,23 +379,10 @@ DEFINEFUNC2(void, RAND_seed, const void *a, a, int b, b, return, DUMMYARG) - DEFINEFUNC(int, RAND_status, void, DUMMYARG, return -1, return) - DEFINEFUNC(RSA *, RSA_new, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(void, RSA_free, RSA *a, a, return, DUMMYARG) --DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) --DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) --#if OPENSSL_VERSION_NUMBER >= 0x10000000L --DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG) --DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG) --DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return 0, return) --#else --DEFINEFUNC(STACK *, sk_new_null, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC2(void, sk_push, STACK *a, a, char *b, b, return, DUMMYARG) --DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG) --DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return 0, return) --#endif - DEFINEFUNC(int, SSL_accept, SSL *a, a, return -1, return) - DEFINEFUNC(int, SSL_clear, SSL *a, a, return -1, return) --DEFINEFUNC3(char *, SSL_CIPHER_description, SSL_CIPHER *a, a, char *b, b, int c, c, return 0, return) --DEFINEFUNC2(int, SSL_CIPHER_get_bits, SSL_CIPHER *a, a, int *b, b, return 0, return) -+DEFINEFUNC3(char *, SSL_CIPHER_description, const SSL_CIPHER *a, a, char *b, b, int c, c, return 0, return) -+DEFINEFUNC2(int, SSL_CIPHER_get_bits, const SSL_CIPHER *a, a, int *b, b, return 0, return) - DEFINEFUNC(int, SSL_connect, SSL *a, a, return -1, return) - DEFINEFUNC(int, SSL_CTX_check_private_key, const SSL_CTX *a, a, return -1, return) - DEFINEFUNC4(long, SSL_CTX_ctrl, SSL_CTX *a, a, int b, b, long c, c, void *d, d, return -1, return) -@@ -287,8 +419,6 @@ DEFINEFUNC(long, SSL_get_verify_result, const SSL *a, a, return -1, return) - #else - DEFINEFUNC(long, SSL_get_verify_result, SSL *a, a, return -1, return) - #endif --DEFINEFUNC(int, SSL_library_init, void, DUMMYARG, return -1, return) --DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG) - DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a, return 0, return) - DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, void *parg, parg, return -1, return) - DEFINEFUNC3(int, SSL_read, SSL *a, a, void *b, b, int c, c, return -1, return) -@@ -301,7 +431,6 @@ DEFINEFUNC(void, SSL_SESSION_free, SSL_SESSION *ses, ses, return, DUMMYARG) - DEFINEFUNC(SSL_SESSION*, SSL_get1_session, SSL *ssl, ssl, return 0, return) - DEFINEFUNC(SSL_SESSION*, SSL_get_session, const SSL *ssl, ssl, return 0, return) - #if OPENSSL_VERSION_NUMBER >= 0x10001000L --DEFINEFUNC5(int, SSL_get_ex_new_index, long argl, argl, void *argp, argp, CRYPTO_EX_new *new_func, new_func, CRYPTO_EX_dup *dup_func, dup_func, CRYPTO_EX_free *free_func, free_func, return -1, return) - DEFINEFUNC3(int, SSL_set_ex_data, SSL *ssl, ssl, int idx, idx, void *arg, arg, return 0, return) - DEFINEFUNC2(void *, SSL_get_ex_data, const SSL *ssl, ssl, int idx, idx, return NULL, return) - #endif -@@ -310,51 +439,9 @@ DEFINEFUNC2(void, SSL_set_psk_client_callback, SSL* ssl, ssl, q_psk_client_callb - DEFINEFUNC2(void, SSL_set_psk_server_callback, SSL* ssl, ssl, q_psk_server_callback_t callback, callback, return, DUMMYARG) - DEFINEFUNC2(int, SSL_CTX_use_psk_identity_hint, SSL_CTX* ctx, ctx, const char *hint, hint, return 0, return) - #endif --#if OPENSSL_VERSION_NUMBER >= 0x10000000L --#ifndef OPENSSL_NO_SSL2 --DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --#ifndef OPENSSL_NO_SSL3_METHOD --DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) --#if OPENSSL_VERSION_NUMBER >= 0x10001000L --DEFINEFUNC(const SSL_METHOD *, TLSv1_1_client_method, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC(const SSL_METHOD *, TLSv1_2_client_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --#ifndef OPENSSL_NO_SSL2 --DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --#ifndef OPENSSL_NO_SSL3_METHOD --DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) --#if OPENSSL_VERSION_NUMBER >= 0x10001000L --DEFINEFUNC(const SSL_METHOD *, TLSv1_1_server_method, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC(const SSL_METHOD *, TLSv1_2_server_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --#else --#ifndef OPENSSL_NO_SSL2 --DEFINEFUNC(SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --#ifndef OPENSSL_NO_SSL3_METHOD --DEFINEFUNC(SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --DEFINEFUNC(SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC(SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) --#ifndef OPENSSL_NO_SSL2 --DEFINEFUNC(SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --#ifndef OPENSSL_NO_SSL3_METHOD --DEFINEFUNC(SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) --#endif --DEFINEFUNC(SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) --DEFINEFUNC(SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) --#endif - DEFINEFUNC3(int, SSL_write, SSL *a, a, const void *b, b, int c, c, return -1, return) - DEFINEFUNC2(int, X509_cmp, X509 *a, a, X509 *b, b, return -1, return) -+DEFINEFUNC4(int, X509_digest, const X509 *x509, x509, const EVP_MD *type, type, unsigned char *md, md, unsigned int *len, len, return -1, return) - #ifndef SSLEAY_MACROS - DEFINEFUNC(X509 *, X509_dup, X509 *a, a, return 0, return) - #endif -@@ -378,6 +465,7 @@ DEFINEFUNC2(int, ASN1_STRING_print, BIO *a, a, ASN1_STRING *b, b, return 0, retu - DEFINEFUNC2(int, X509_check_issued, X509 *a, a, X509 *b, b, return -1, return) - DEFINEFUNC(X509_NAME *, X509_get_issuer_name, X509 *a, a, return 0, return) - DEFINEFUNC(X509_NAME *, X509_get_subject_name, X509 *a, a, return 0, return) -+DEFINEFUNC(ASN1_INTEGER *, X509_get_serialNumber, X509 *a, a, return 0, return) - DEFINEFUNC(int, X509_verify_cert, X509_STORE_CTX *a, a, return -1, return) - DEFINEFUNC(int, X509_NAME_entry_count, X509_NAME *a, a, return 0, return) - DEFINEFUNC2(X509_NAME_ENTRY *, X509_NAME_get_entry, X509_NAME *a, a, int b, b, return 0, return) -@@ -393,25 +481,8 @@ DEFINEFUNC2(int, X509_STORE_CTX_set_purpose, X509_STORE_CTX *a, a, int b, b, ret - DEFINEFUNC(int, X509_STORE_CTX_get_error, X509_STORE_CTX *a, a, return -1, return) - DEFINEFUNC(int, X509_STORE_CTX_get_error_depth, X509_STORE_CTX *a, a, return -1, return) - DEFINEFUNC(X509 *, X509_STORE_CTX_get_current_cert, X509_STORE_CTX *a, a, return 0, return) --DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return 0, return) - DEFINEFUNC(X509_STORE_CTX *, X509_STORE_CTX_new, DUMMYARG, DUMMYARG, return 0, return) --#ifdef SSLEAY_MACROS --DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return) --DEFINEFUNC2(int, i2d_RSAPrivateKey, const RSA *a, a, unsigned char **b, b, return -1, return) --#ifndef OPENSSL_NO_EC --DEFINEFUNC2(int, i2d_ECPrivateKey, const EC_KEY *a, a, unsigned char **b, b, return -1, return) --#endif --DEFINEFUNC3(RSA *, d2i_RSAPrivateKey, RSA **a, a, unsigned char **b, b, long c, c, return 0, return) --DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsigned char **b, b, long c, c, return 0, return) --#ifndef OPENSSL_NO_EC --DEFINEFUNC3(EC_KEY *, d2i_ECPrivateKey, EC_KEY **a, a, unsigned char **b, b, long c, c, return 0, return) --#endif --#endif --DEFINEFUNC(void, OPENSSL_add_all_algorithms_noconf, void, DUMMYARG, return, DUMMYARG) --DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG) - DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return) --DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return) --DEFINEFUNC(const char *, SSLeay_version, int a, a, return 0, return) - DEFINEFUNC2(int, i2d_SSL_SESSION, SSL_SESSION *in, in, unsigned char **pp, pp, return 0, return) - DEFINEFUNC3(SSL_SESSION *, d2i_SSL_SESSION, SSL_SESSION **a, a, const unsigned char **pp, pp, long length, length, return 0, return) - #if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) -@@ -694,8 +765,8 @@ static QPair loadOpenSsl() - #ifndef Q_OS_DARWIN - // second attempt: find the development files libssl.so and libcrypto.so - // -- // disabled on OS X/iOS: -- // OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third -+ // disabled on macOS/iOS: -+ // macOS's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third - // attempt, _after_ /Contents/Frameworks has been searched. - // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. - libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); -@@ -754,7 +825,11 @@ bool q_resolveOpenSslSymbols() - static bool symbolsResolved = false; - static bool triedToResolveSymbols = false; - #ifndef QT_NO_THREAD -+#if QT_CONFIG(opensslv11) -+ QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_OPENSSL_init_ssl)); -+#else - QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_SSL_library_init)); -+#endif - #endif - if (symbolsResolved) - return true; -@@ -771,11 +846,145 @@ bool q_resolveOpenSslSymbols() - // failed to load them - return false; - -+#if QT_CONFIG(opensslv11) -+ -+ RESOLVEFUNC(OPENSSL_init_ssl) -+ RESOLVEFUNC(OPENSSL_init_crypto) -+ RESOLVEFUNC(ASN1_STRING_get0_data) -+ RESOLVEFUNC(EVP_CIPHER_CTX_reset) -+ RESOLVEFUNC(EVP_PKEY_base_id) -+ RESOLVEFUNC(RSA_bits) -+ RESOLVEFUNC(OPENSSL_sk_new_null) -+ RESOLVEFUNC(OPENSSL_sk_push) -+ RESOLVEFUNC(OPENSSL_sk_free) -+ RESOLVEFUNC(OPENSSL_sk_num) -+ RESOLVEFUNC(OPENSSL_sk_pop_free) -+ RESOLVEFUNC(OPENSSL_sk_value) -+ RESOLVEFUNC(DH_get0_pqg) -+ RESOLVEFUNC(SSL_CTX_set_options) -+ RESOLVEFUNC(SSL_get_client_random) -+ RESOLVEFUNC(SSL_SESSION_get_master_key) -+ RESOLVEFUNC(SSL_session_reused) -+ RESOLVEFUNC(SSL_get_session) -+ RESOLVEFUNC(CRYPTO_get_ex_new_index) -+ RESOLVEFUNC(TLS_method) -+ RESOLVEFUNC(TLS_client_method) -+ RESOLVEFUNC(TLS_server_method) -+ RESOLVEFUNC(X509_STORE_CTX_get0_chain) -+ RESOLVEFUNC(X509_getm_notBefore) -+ RESOLVEFUNC(X509_getm_notAfter) -+ RESOLVEFUNC(X509_get_version) -+ RESOLVEFUNC(X509_get_pubkey) -+ RESOLVEFUNC(X509_STORE_set_verify_cb) -+ RESOLVEFUNC(CRYPTO_free) -+ RESOLVEFUNC(OpenSSL_version_num) -+ RESOLVEFUNC(OpenSSL_version) -+ if (!_q_OpenSSL_version) { -+ // Apparently, we were built with OpenSSL 1.1 enabled but are now using -+ // a wrong library. -+ delete libs.first; -+ delete libs.second; -+ qCWarning(lcSsl, "Incompatible version of OpenSSL"); -+ return false; -+ } -+ -+ RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint) -+ RESOLVEFUNC(DH_bits) -+ RESOLVEFUNC(DSA_bits) -+ -+#else // !opensslv11 -+ -+ RESOLVEFUNC(ASN1_STRING_data) -+ - #ifdef SSLEAY_MACROS - RESOLVEFUNC(ASN1_dup) -+#endif // SSLEAY_MACROS -+ RESOLVEFUNC(BIO_new_file) -+ RESOLVEFUNC(ERR_clear_error) -+ RESOLVEFUNC(CRYPTO_free) -+ RESOLVEFUNC(CRYPTO_num_locks) -+ RESOLVEFUNC(CRYPTO_set_id_callback) -+ RESOLVEFUNC(CRYPTO_set_locking_callback) -+ RESOLVEFUNC(ERR_peek_last_error) -+ RESOLVEFUNC(ERR_free_strings) -+ RESOLVEFUNC(EVP_CIPHER_CTX_cleanup) -+ RESOLVEFUNC(EVP_CIPHER_CTX_init) -+ -+#ifdef SSLEAY_MACROS // ### verify -+ RESOLVEFUNC(PEM_ASN1_read_bio) -+#endif // SSLEAY_MACROS -+ -+ RESOLVEFUNC(sk_new_null) -+ RESOLVEFUNC(sk_push) -+ RESOLVEFUNC(sk_free) -+ RESOLVEFUNC(sk_num) -+ RESOLVEFUNC(sk_pop_free) -+ RESOLVEFUNC(sk_value) -+ RESOLVEFUNC(SSL_library_init) -+ RESOLVEFUNC(SSL_load_error_strings) -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+ RESOLVEFUNC(SSL_get_ex_new_index) -+#endif -+#ifndef OPENSSL_NO_SSL2 -+ RESOLVEFUNC(SSLv2_client_method) - #endif -+#ifndef OPENSSL_NO_SSL3_METHOD -+ RESOLVEFUNC(SSLv3_client_method) -+#endif -+ RESOLVEFUNC(SSLv23_client_method) -+ RESOLVEFUNC(TLSv1_client_method) -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+ RESOLVEFUNC(TLSv1_1_client_method) -+ RESOLVEFUNC(TLSv1_2_client_method) -+#endif -+#ifndef OPENSSL_NO_SSL2 -+ RESOLVEFUNC(SSLv2_server_method) -+#endif -+#ifndef OPENSSL_NO_SSL3_METHOD -+ RESOLVEFUNC(SSLv3_server_method) -+#endif -+ RESOLVEFUNC(SSLv23_server_method) -+ RESOLVEFUNC(TLSv1_server_method) -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+ RESOLVEFUNC(TLSv1_1_server_method) -+ RESOLVEFUNC(TLSv1_2_server_method) -+#endif -+ RESOLVEFUNC(X509_STORE_CTX_get_chain) -+#ifdef SSLEAY_MACROS -+ RESOLVEFUNC(i2d_DSAPrivateKey) -+ RESOLVEFUNC(i2d_RSAPrivateKey) -+ RESOLVEFUNC(d2i_DSAPrivateKey) -+ RESOLVEFUNC(d2i_RSAPrivateKey) -+#endif -+ RESOLVEFUNC(CONF_get1_default_config_file) -+ RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf) -+ RESOLVEFUNC(OPENSSL_add_all_algorithms_conf) -+ RESOLVEFUNC(SSLeay) -+ -+ if (!_q_SSLeay || q_SSLeay() >= 0x10100000L) { -+ // OpenSSL 1.1 has deprecated and removed SSLeay. We consider a failure to -+ // resolve this symbol as a failure to resolve symbols. -+ // The right operand of '||' above is ... a bit of paranoia. -+ delete libs.first; -+ delete libs.second; -+ qCWarning(lcSsl, "Incompatible version of OpenSSL"); -+ return false; -+ } -+ -+ -+ RESOLVEFUNC(SSLeay_version) -+ -+#ifndef OPENSSL_NO_EC -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+ if (q_SSLeay() >= 0x10002000L) -+ RESOLVEFUNC(EC_curve_nist2nid) -+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L -+#endif // OPENSSL_NO_EC -+ -+ -+#endif // !opensslv11 -+ - RESOLVEFUNC(ASN1_INTEGER_get) -- RESOLVEFUNC(ASN1_STRING_data) - RESOLVEFUNC(ASN1_STRING_length) - RESOLVEFUNC(ASN1_STRING_to_UTF8) - RESOLVEFUNC(BIO_ctrl) -@@ -794,25 +1003,22 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(BN_is_word) - #endif - RESOLVEFUNC(BN_mod_word) -- RESOLVEFUNC(CRYPTO_free) -- RESOLVEFUNC(CRYPTO_num_locks) -- RESOLVEFUNC(CRYPTO_set_id_callback) -- RESOLVEFUNC(CRYPTO_set_locking_callback) - RESOLVEFUNC(DSA_new) - RESOLVEFUNC(DSA_free) - RESOLVEFUNC(ERR_error_string) - RESOLVEFUNC(ERR_get_error) -- RESOLVEFUNC(ERR_free_strings) -- RESOLVEFUNC(EVP_CIPHER_CTX_cleanup) -- RESOLVEFUNC(EVP_CIPHER_CTX_init) -+ RESOLVEFUNC(EVP_CIPHER_CTX_new) -+ RESOLVEFUNC(EVP_CIPHER_CTX_free) - RESOLVEFUNC(EVP_CIPHER_CTX_ctrl) - RESOLVEFUNC(EVP_CIPHER_CTX_set_key_length) - RESOLVEFUNC(EVP_CipherInit) -+ RESOLVEFUNC(EVP_CipherInit_ex) - RESOLVEFUNC(EVP_CipherUpdate) - RESOLVEFUNC(EVP_CipherFinal) - RESOLVEFUNC(EVP_des_cbc) - RESOLVEFUNC(EVP_des_ede3_cbc) - RESOLVEFUNC(EVP_rc2_cbc) -+ RESOLVEFUNC(EVP_sha1) - RESOLVEFUNC(EVP_PKEY_assign) - RESOLVEFUNC(EVP_PKEY_set1_RSA) - RESOLVEFUNC(EVP_PKEY_set1_DSA) -@@ -834,9 +1040,8 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(i2t_ASN1_OBJECT) - RESOLVEFUNC(OBJ_obj2txt) - RESOLVEFUNC(OBJ_obj2nid) --#ifdef SSLEAY_MACROS // ### verify -- RESOLVEFUNC(PEM_ASN1_read_bio) --#else -+ -+#ifndef SSLEAY_MACROS - RESOLVEFUNC(PEM_read_bio_PrivateKey) - RESOLVEFUNC(PEM_read_bio_DSAPrivateKey) - RESOLVEFUNC(PEM_read_bio_RSAPrivateKey) -@@ -849,7 +1054,8 @@ bool q_resolveOpenSslSymbols() - #ifndef OPENSSL_NO_EC - RESOLVEFUNC(PEM_write_bio_ECPrivateKey) - #endif --#endif -+#endif // !SSLEAY_MACROS -+ - RESOLVEFUNC(PEM_read_bio_PUBKEY) - RESOLVEFUNC(PEM_read_bio_DSA_PUBKEY) - RESOLVEFUNC(PEM_read_bio_RSA_PUBKEY) -@@ -865,12 +1071,6 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(RAND_status) - RESOLVEFUNC(RSA_new) - RESOLVEFUNC(RSA_free) -- RESOLVEFUNC(sk_new_null) -- RESOLVEFUNC(sk_push) -- RESOLVEFUNC(sk_free) -- RESOLVEFUNC(sk_num) -- RESOLVEFUNC(sk_pop_free) -- RESOLVEFUNC(sk_value) - RESOLVEFUNC(SSL_CIPHER_description) - RESOLVEFUNC(SSL_CIPHER_get_bits) - RESOLVEFUNC(SSL_CTX_check_private_key) -@@ -898,8 +1098,6 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(SSL_get_peer_cert_chain) - RESOLVEFUNC(SSL_get_peer_certificate) - RESOLVEFUNC(SSL_get_verify_result) -- RESOLVEFUNC(SSL_library_init) -- RESOLVEFUNC(SSL_load_error_strings) - RESOLVEFUNC(SSL_new) - RESOLVEFUNC(SSL_ctrl) - RESOLVEFUNC(SSL_read) -@@ -912,7 +1110,6 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(SSL_get1_session) - RESOLVEFUNC(SSL_get_session) - #if OPENSSL_VERSION_NUMBER >= 0x10001000L -- RESOLVEFUNC(SSL_get_ex_new_index) - RESOLVEFUNC(SSL_set_ex_data) - RESOLVEFUNC(SSL_get_ex_data) - #endif -@@ -922,30 +1119,6 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(SSL_CTX_use_psk_identity_hint) - #endif - RESOLVEFUNC(SSL_write) --#ifndef OPENSSL_NO_SSL2 -- RESOLVEFUNC(SSLv2_client_method) --#endif --#ifndef OPENSSL_NO_SSL3_METHOD -- RESOLVEFUNC(SSLv3_client_method) --#endif -- RESOLVEFUNC(SSLv23_client_method) -- RESOLVEFUNC(TLSv1_client_method) --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -- RESOLVEFUNC(TLSv1_1_client_method) -- RESOLVEFUNC(TLSv1_2_client_method) --#endif --#ifndef OPENSSL_NO_SSL2 -- RESOLVEFUNC(SSLv2_server_method) --#endif --#ifndef OPENSSL_NO_SSL3_METHOD -- RESOLVEFUNC(SSLv3_server_method) --#endif -- RESOLVEFUNC(SSLv23_server_method) -- RESOLVEFUNC(TLSv1_server_method) --#if OPENSSL_VERSION_NUMBER >= 0x10001000L -- RESOLVEFUNC(TLSv1_1_server_method) -- RESOLVEFUNC(TLSv1_2_server_method) --#endif - RESOLVEFUNC(X509_NAME_entry_count) - RESOLVEFUNC(X509_NAME_get_entry) - RESOLVEFUNC(X509_NAME_ENTRY_get_data) -@@ -961,12 +1134,12 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(X509_STORE_CTX_get_error) - RESOLVEFUNC(X509_STORE_CTX_get_error_depth) - RESOLVEFUNC(X509_STORE_CTX_get_current_cert) -- RESOLVEFUNC(X509_STORE_CTX_get_chain) - RESOLVEFUNC(X509_cmp) - #ifndef SSLEAY_MACROS - RESOLVEFUNC(X509_dup) - #endif - RESOLVEFUNC(X509_print) -+ RESOLVEFUNC(X509_digest) - RESOLVEFUNC(X509_EXTENSION_get_object) - RESOLVEFUNC(X509_free) - RESOLVEFUNC(X509_get_ext) -@@ -982,20 +1155,11 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(X509_check_issued) - RESOLVEFUNC(X509_get_issuer_name) - RESOLVEFUNC(X509_get_subject_name) -+ RESOLVEFUNC(X509_get_serialNumber) - RESOLVEFUNC(X509_verify_cert) - RESOLVEFUNC(d2i_X509) - RESOLVEFUNC(i2d_X509) --#ifdef SSLEAY_MACROS -- RESOLVEFUNC(i2d_DSAPrivateKey) -- RESOLVEFUNC(i2d_RSAPrivateKey) -- RESOLVEFUNC(d2i_DSAPrivateKey) -- RESOLVEFUNC(d2i_RSAPrivateKey) --#endif -- RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf) -- RESOLVEFUNC(OPENSSL_add_all_algorithms_conf) - RESOLVEFUNC(SSL_CTX_load_verify_locations) -- RESOLVEFUNC(SSLeay) -- RESOLVEFUNC(SSLeay_version) - RESOLVEFUNC(i2d_SSL_SESSION) - RESOLVEFUNC(d2i_SSL_SESSION) - #if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) -@@ -1019,27 +1183,14 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(EC_KEY_new_by_curve_name) - RESOLVEFUNC(EC_KEY_free) - RESOLVEFUNC(EC_get_builtin_curves) --#if OPENSSL_VERSION_NUMBER >= 0x10002000L -- if (q_SSLeay() >= 0x10002000L) -- RESOLVEFUNC(EC_curve_nist2nid) --#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L - #endif // OPENSSL_NO_EC - RESOLVEFUNC(PKCS12_parse) - RESOLVEFUNC(d2i_PKCS12_bio) - RESOLVEFUNC(PKCS12_free) - -+ symbolsResolved = true; - delete libs.first; - delete libs.second; -- if (!_q_SSLeay || q_SSLeay() >= 0x10100000L) { -- // OpenSSL 1.1 deprecated and removed SSLeay. We consider a failure to -- // resolve this symbol as a failure to resolve symbols. -- // The right operand of '||' above ... a bit of paranoia. -- qCWarning(lcSsl, "Incompatible version of OpenSSL"); -- return false; -- } -- -- symbolsResolved = true; -- - return true; - } - #endif // QT_CONFIG(library) -diff --git a/qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h b/qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h -index b35a895d38..796bf2d4f5 100644 ---- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h -+++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h -@@ -1,6 +1,6 @@ - /**************************************************************************** - ** --** Copyright (C) 2016 The Qt Company Ltd. -+** Copyright (C) 2017 The Qt Company Ltd. - ** Copyright (C) 2014 BlackBerry Limited. All rights reserved. - ** Contact: https://www.qt.io/licensing/ - ** -@@ -56,6 +56,7 @@ - #ifndef QSSLSOCKET_OPENSSL_SYMBOLS_P_H - #define QSSLSOCKET_OPENSSL_SYMBOLS_P_H - -+ - // - // W A R N I N G - // ------------- -@@ -215,17 +216,20 @@ QT_BEGIN_NAMESPACE - - #endif // !defined QT_LINKED_OPENSSL - -+#if QT_CONFIG(opensslv11) -+#include "qsslsocket_openssl11_symbols_p.h" -+#else -+#include "qsslsocket_opensslpre11_symbols_p.h" -+#endif // QT_CONFIG -+ - bool q_resolveOpenSslSymbols(); - long q_ASN1_INTEGER_get(ASN1_INTEGER *a); --unsigned char * q_ASN1_STRING_data(ASN1_STRING *a); - int q_ASN1_STRING_length(ASN1_STRING *a); - int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b); - long q_BIO_ctrl(BIO *a, int b, long c, void *d); - Q_AUTOTEST_EXPORT int q_BIO_free(BIO *a); --Q_AUTOTEST_EXPORT BIO *q_BIO_new(BIO_METHOD *a); - BIO *q_BIO_new_mem_buf(void *a, int b); - int q_BIO_read(BIO *a, void *b, int c); --Q_AUTOTEST_EXPORT BIO_METHOD *q_BIO_s_mem(); - Q_AUTOTEST_EXPORT int q_BIO_write(BIO *a, const void *b, int c); - int q_BN_num_bits(const BIGNUM *a); - #if OPENSSL_VERSION_NUMBER >= 0x10100000L -@@ -247,26 +251,23 @@ BN_ULONG q_BN_mod_word(const BIGNUM *a, BN_ULONG w); - const EC_GROUP* q_EC_KEY_get0_group(const EC_KEY* k); - int q_EC_GROUP_get_degree(const EC_GROUP* g); - #endif --int q_CRYPTO_num_locks(); --void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int)); --void q_CRYPTO_set_id_callback(unsigned long (*a)()); --void q_CRYPTO_free(void *a); - DSA *q_DSA_new(); - void q_DSA_free(DSA *a); - X509 *q_d2i_X509(X509 **a, const unsigned char **b, long c); - char *q_ERR_error_string(unsigned long a, char *b); - unsigned long q_ERR_get_error(); --void q_ERR_free_strings(); --void q_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a); --void q_EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a); -+EVP_CIPHER_CTX *q_EVP_CIPHER_CTX_new(); -+void q_EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a); - int q_EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr); - int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen); - int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc); -+int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc); - int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl); - int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl); - const EVP_CIPHER *q_EVP_des_cbc(); - const EVP_CIPHER *q_EVP_des_ede3_cbc(); - const EVP_CIPHER *q_EVP_rc2_cbc(); -+const EVP_MD *q_EVP_sha1(); - int q_EVP_PKEY_assign(EVP_PKEY *a, int b, char *c); - Q_AUTOTEST_EXPORT int q_EVP_PKEY_set1_RSA(EVP_PKEY *a, RSA *b); - int q_EVP_PKEY_set1_DSA(EVP_PKEY *a, DSA *b); -@@ -310,7 +311,7 @@ int q_PEM_write_bio_RSAPrivateKey(BIO *a, RSA *b, const EVP_CIPHER *c, unsigned - int q_PEM_write_bio_ECPrivateKey(BIO *a, EC_KEY *b, const EVP_CIPHER *c, unsigned char *d, - int e, pem_password_cb *f, void *g); - #endif --#endif -+#endif // SSLEAY_MACROS - Q_AUTOTEST_EXPORT EVP_PKEY *q_PEM_read_bio_PUBKEY(BIO *a, EVP_PKEY **b, pem_password_cb *c, void *d); - DSA *q_PEM_read_bio_DSA_PUBKEY(BIO *a, DSA **b, pem_password_cb *c, void *d); - RSA *q_PEM_read_bio_RSA_PUBKEY(BIO *a, RSA **b, pem_password_cb *c, void *d); -@@ -326,23 +327,10 @@ void q_RAND_seed(const void *a, int b); - int q_RAND_status(); - RSA *q_RSA_new(); - void q_RSA_free(RSA *a); --int q_sk_num(STACK *a); --void q_sk_pop_free(STACK *a, void (*b)(void *)); --#if OPENSSL_VERSION_NUMBER >= 0x10000000L --_STACK *q_sk_new_null(); --void q_sk_push(_STACK *st, void *data); --void q_sk_free(_STACK *a); --void * q_sk_value(STACK *a, int b); --#else --STACK *q_sk_new_null(); --void q_sk_push(STACK *st, char *data); --void q_sk_free(STACK *a); --char * q_sk_value(STACK *a, int b); --#endif - int q_SSL_accept(SSL *a); - int q_SSL_clear(SSL *a); --char *q_SSL_CIPHER_description(SSL_CIPHER *a, char *b, int c); --int q_SSL_CIPHER_get_bits(SSL_CIPHER *a, int *b); -+char *q_SSL_CIPHER_description(const SSL_CIPHER *a, char *b, int c); -+int q_SSL_CIPHER_get_bits(const SSL_CIPHER *a, int *b); - int q_SSL_connect(SSL *a); - int q_SSL_CTX_check_private_key(const SSL_CTX *a); - long q_SSL_CTX_ctrl(SSL_CTX *a, int b, long c, void *d); -@@ -374,8 +362,6 @@ int q_SSL_get_error(SSL *a, int b); - STACK_OF(X509) *q_SSL_get_peer_cert_chain(SSL *a); - X509 *q_SSL_get_peer_certificate(SSL *a); - long q_SSL_get_verify_result(const SSL *a); --int q_SSL_library_init(); --void q_SSL_load_error_strings(); - SSL *q_SSL_new(SSL_CTX *a); - long q_SSL_ctrl(SSL *ssl,int cmd, long larg, void *parg); - int q_SSL_read(SSL *a, void *b, int c); -@@ -388,7 +374,6 @@ void q_SSL_SESSION_free(SSL_SESSION *ses); - SSL_SESSION *q_SSL_get1_session(SSL *ssl); - SSL_SESSION *q_SSL_get_session(const SSL *ssl); - #if OPENSSL_VERSION_NUMBER >= 0x10001000L --int q_SSL_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); - int q_SSL_set_ex_data(SSL *ssl, int idx, void *arg); - void *q_SSL_get_ex_data(const SSL *ssl, int idx); - #endif -@@ -399,49 +384,6 @@ typedef unsigned int (*q_psk_server_callback_t)(SSL *ssl, const char *identity, - void q_SSL_set_psk_server_callback(SSL *ssl, q_psk_server_callback_t callback); - int q_SSL_CTX_use_psk_identity_hint(SSL_CTX *ctx, const char *hint); - #endif // OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK) --#if OPENSSL_VERSION_NUMBER >= 0x10000000L --#ifndef OPENSSL_NO_SSL2 --const SSL_METHOD *q_SSLv2_client_method(); --#endif --#ifndef OPENSSL_NO_SSL3_METHOD --const SSL_METHOD *q_SSLv3_client_method(); --#endif --const SSL_METHOD *q_SSLv23_client_method(); --const SSL_METHOD *q_TLSv1_client_method(); --const SSL_METHOD *q_TLSv1_1_client_method(); --const SSL_METHOD *q_TLSv1_2_client_method(); --#ifndef OPENSSL_NO_SSL2 --const SSL_METHOD *q_SSLv2_server_method(); --#endif --#ifndef OPENSSL_NO_SSL3_METHOD --const SSL_METHOD *q_SSLv3_server_method(); --#endif --const SSL_METHOD *q_SSLv23_server_method(); --const SSL_METHOD *q_TLSv1_server_method(); --const SSL_METHOD *q_TLSv1_1_server_method(); --const SSL_METHOD *q_TLSv1_2_server_method(); --#else --#ifndef OPENSSL_NO_SSL2 --SSL_METHOD *q_SSLv2_client_method(); --#endif --#ifndef OPENSSL_NO_SSL3_METHOD --SSL_METHOD *q_SSLv3_client_method(); --#endif --SSL_METHOD *q_SSLv23_client_method(); --SSL_METHOD *q_TLSv1_client_method(); --SSL_METHOD *q_TLSv1_1_client_method(); --SSL_METHOD *q_TLSv1_2_client_method(); --#ifndef OPENSSL_NO_SSL2 --SSL_METHOD *q_SSLv2_server_method(); --#endif --#ifndef OPENSSL_NO_SSL3_METHOD --SSL_METHOD *q_SSLv3_server_method(); --#endif --SSL_METHOD *q_SSLv23_server_method(); --SSL_METHOD *q_TLSv1_server_method(); --SSL_METHOD *q_TLSv1_1_server_method(); --SSL_METHOD *q_TLSv1_2_server_method(); --#endif - int q_SSL_write(SSL *a, const void *b, int c); - int q_X509_cmp(X509 *a, X509 *b); - #ifdef SSLEAY_MACROS -@@ -452,6 +394,7 @@ void *q_ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x); - X509 *q_X509_dup(X509 *a); - #endif - void q_X509_print(BIO *a, X509*b); -+int q_X509_digest(const X509 *x509, const EVP_MD *type, unsigned char *md, unsigned int *len); - ASN1_OBJECT *q_X509_EXTENSION_get_object(X509_EXTENSION *a); - void q_X509_free(X509 *a); - X509_EXTENSION *q_X509_get_ext(X509 *a, int b); -@@ -471,6 +414,7 @@ int q_ASN1_STRING_print(BIO *a, ASN1_STRING *b); - int q_X509_check_issued(X509 *a, X509 *b); - X509_NAME *q_X509_get_issuer_name(X509 *a); - X509_NAME *q_X509_get_subject_name(X509 *a); -+ASN1_INTEGER *q_X509_get_serialNumber(X509 *a); - int q_X509_verify_cert(X509_STORE_CTX *ctx); - int q_X509_NAME_entry_count(X509_NAME *a); - X509_NAME_ENTRY *q_X509_NAME_get_entry(X509_NAME *a,int b); -@@ -488,7 +432,6 @@ int q_X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose); - int q_X509_STORE_CTX_get_error(X509_STORE_CTX *ctx); - int q_X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx); - X509 *q_X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx); --STACK_OF(X509) *q_X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx); - - // Diffie-Hellman support - DH *q_DH_new(); -@@ -522,34 +465,9 @@ int q_PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, - PKCS12 *q_d2i_PKCS12_bio(BIO *bio, PKCS12 **pkcs12); - void q_PKCS12_free(PKCS12 *pkcs12); - -- - #define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp) - #define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL) --#ifdef SSLEAY_MACROS --int q_i2d_DSAPrivateKey(const DSA *a, unsigned char **pp); --int q_i2d_RSAPrivateKey(const RSA *a, unsigned char **pp); --RSA *q_d2i_RSAPrivateKey(RSA **a, unsigned char **pp, long length); --DSA *q_d2i_DSAPrivateKey(DSA **a, unsigned char **pp, long length); --#define q_PEM_read_bio_RSAPrivateKey(bp, x, cb, u) \ -- (RSA *)q_PEM_ASN1_read_bio( \ -- (void *(*)(void**, const unsigned char**, long int))q_d2i_RSAPrivateKey, PEM_STRING_RSA, bp, (void **)x, cb, u) --#define q_PEM_read_bio_DSAPrivateKey(bp, x, cb, u) \ -- (DSA *)q_PEM_ASN1_read_bio( \ -- (void *(*)(void**, const unsigned char**, long int))q_d2i_DSAPrivateKey, PEM_STRING_DSA, bp, (void **)x, cb, u) --#define q_PEM_write_bio_RSAPrivateKey(bp,x,enc,kstr,klen,cb,u) \ -- PEM_ASN1_write_bio((int (*)(void*, unsigned char**))q_i2d_RSAPrivateKey,PEM_STRING_RSA,\ -- bp,(char *)x,enc,kstr,klen,cb,u) --#define q_PEM_write_bio_DSAPrivateKey(bp,x,enc,kstr,klen,cb,u) \ -- PEM_ASN1_write_bio((int (*)(void*, unsigned char**))q_i2d_DSAPrivateKey,PEM_STRING_DSA,\ -- bp,(char *)x,enc,kstr,klen,cb,u) --#define q_PEM_read_bio_DHparams(bp, dh, cb, u) \ -- (DH *)q_PEM_ASN1_read_bio( \ -- (void *(*)(void**, const unsigned char**, long int))q_d2i_DHparams, PEM_STRING_DHPARAMS, bp, (void **)x, cb, u) --#endif --#define q_SSL_CTX_set_options(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL) - #define q_SSL_CTX_set_mode(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,(op),NULL) --#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st) --#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i) - #define q_sk_GENERAL_NAME_num(st) q_SKM_sk_num(GENERAL_NAME, (st)) - #define q_sk_GENERAL_NAME_value(st, i) q_SKM_sk_value(GENERAL_NAME, (st), (i)) - #define q_sk_X509_num(st) q_SKM_sk_num(X509, (st)) -@@ -558,18 +476,12 @@ DSA *q_d2i_DSAPrivateKey(DSA **a, unsigned char **pp, long length); - #define q_sk_SSL_CIPHER_value(st, i) q_SKM_sk_value(SSL_CIPHER, (st), (i)) - #define q_SSL_CTX_add_extra_chain_cert(ctx,x509) \ - q_SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509) --#define q_X509_get_notAfter(x) X509_get_notAfter(x) --#define q_X509_get_notBefore(x) X509_get_notBefore(x) - #define q_EVP_PKEY_assign_RSA(pkey,rsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\ - (char *)(rsa)) - #define q_EVP_PKEY_assign_DSA(pkey,dsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\ - (char *)(dsa)) - #define q_OpenSSL_add_all_algorithms() q_OPENSSL_add_all_algorithms_conf() --void q_OPENSSL_add_all_algorithms_noconf(); --void q_OPENSSL_add_all_algorithms_conf(); - int q_SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, const char *CApath); --long q_SSLeay(); --const char *q_SSLeay_version(int type); - int q_i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp); - SSL_SESSION *q_d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length); - -diff --git a/qtbase/src/network/ssl/qsslsocket_opensslpre11.cpp b/qtbase/src/network/ssl/qsslsocket_opensslpre11.cpp -new file mode 100644 -index 0000000000..e51888c5f2 ---- /dev/null -+++ b/qtbase/src/network/ssl/qsslsocket_opensslpre11.cpp -@@ -0,0 +1,424 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2017 The Qt Company Ltd. -+** Copyright (C) 2014 Governikus GmbH & Co. KG -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the QtNetwork module of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+/**************************************************************************** -+** -+** In addition, as a special exception, the copyright holders listed above give -+** permission to link the code of its release of Qt with the OpenSSL project's -+** "OpenSSL" library (or modified versions of the "OpenSSL" library that use the -+** same license as the original version), and distribute the linked executables. -+** -+** You must comply with the GNU General Public License version 2 in all -+** respects for all of the code used other than the "OpenSSL" code. If you -+** modify this file, you may extend this exception to your version of the file, -+** but you are not obligated to do so. If you do not wish to do so, delete -+** this exception statement from your version of this file. -+** -+****************************************************************************/ -+ -+//#define QT_DECRYPT_SSL_TRAFFIC -+ -+#include "qssl_p.h" -+#include "qsslsocket_openssl_p.h" -+#include "qsslsocket_openssl_symbols_p.h" -+#include "qsslsocket.h" -+#include "qsslkey.h" -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+QT_BEGIN_NAMESPACE -+ -+/* \internal -+ -+ From OpenSSL's thread(3) manual page: -+ -+ OpenSSL can safely be used in multi-threaded applications provided that at -+ least two callback functions are set. -+ -+ locking_function(int mode, int n, const char *file, int line) is needed to -+ perform locking on shared data structures. (Note that OpenSSL uses a -+ number of global data structures that will be implicitly shared -+ whenever multiple threads use OpenSSL.) Multi-threaded -+ applications will crash at random if it is not set. ... -+ ... -+ id_function(void) is a function that returns a thread ID. It is not -+ needed on Windows nor on platforms where getpid() returns a different -+ ID for each thread (most notably Linux) -+*/ -+ -+class QOpenSslLocks -+{ -+public: -+ QOpenSslLocks() -+ : initLocker(QMutex::Recursive), -+ locksLocker(QMutex::Recursive) -+ { -+ QMutexLocker locker(&locksLocker); -+ int numLocks = q_CRYPTO_num_locks(); -+ locks = new QMutex *[numLocks]; -+ memset(locks, 0, numLocks * sizeof(QMutex *)); -+ } -+ ~QOpenSslLocks() -+ { -+ QMutexLocker locker(&locksLocker); -+ for (int i = 0; i < q_CRYPTO_num_locks(); ++i) -+ delete locks[i]; -+ delete [] locks; -+ -+ QSslSocketPrivate::deinitialize(); -+ } -+ QMutex *lock(int num) -+ { -+ QMutexLocker locker(&locksLocker); -+ QMutex *tmp = locks[num]; -+ if (!tmp) -+ tmp = locks[num] = new QMutex(QMutex::Recursive); -+ return tmp; -+ } -+ -+ QMutex *globalLock() -+ { -+ return &locksLocker; -+ } -+ -+ QMutex *initLock() -+ { -+ return &initLocker; -+ } -+ -+private: -+ QMutex initLocker; -+ QMutex locksLocker; -+ QMutex **locks; -+}; -+ -+Q_GLOBAL_STATIC(QOpenSslLocks, openssl_locks) -+ -+extern "C" { -+static void locking_function(int mode, int lockNumber, const char *, int) -+{ -+ QMutex *mutex = openssl_locks()->lock(lockNumber); -+ -+ // Lock or unlock it -+ if (mode & CRYPTO_LOCK) -+ mutex->lock(); -+ else -+ mutex->unlock(); -+} -+static unsigned long id_function() -+{ -+ return (quintptr)QThread::currentThreadId(); -+} -+ -+} // extern "C" -+ -+static void q_OpenSSL_add_all_algorithms_safe() -+{ -+#ifdef Q_OS_WIN -+ // Prior to version 1.0.1m an attempt to call OpenSSL_add_all_algorithms on -+ // Windows could result in 'exit' call from OPENSSL_config (QTBUG-43843). -+ // We can predict this and avoid OPENSSL_add_all_algorithms call. -+ // From OpenSSL docs: -+ // "An application does not need to add algorithms to use them explicitly, -+ // for example by EVP_sha1(). It just needs to add them if it (or any of -+ // the functions it calls) needs to lookup algorithms. -+ // The cipher and digest lookup functions are used in many parts of the -+ // library. If the table is not initialized several functions will -+ // misbehave and complain they cannot find algorithms. This includes the -+ // PEM, PKCS#12, SSL and S/MIME libraries. This is a common query in -+ // the OpenSSL mailing lists." -+ // -+ // Anyway, as a result, we chose not to call this function if it would exit. -+ -+ if (q_SSLeay() < 0x100010DFL) -+ { -+ // Now, before we try to call it, check if an attempt to open config file -+ // will result in exit: -+ if (char *confFileName = q_CONF_get1_default_config_file()) { -+ BIO *confFile = q_BIO_new_file(confFileName, "r"); -+ const auto lastError = q_ERR_peek_last_error(); -+ q_CRYPTO_free(confFileName); -+ if (confFile) { -+ q_BIO_free(confFile); -+ } else { -+ q_ERR_clear_error(); -+ if (ERR_GET_REASON(lastError) == ERR_R_SYS_LIB) { -+ qCWarning(lcSsl, "failed to open openssl.conf file"); -+ return; -+ } -+ } -+ } -+ } -+#endif // Q_OS_WIN -+ -+ q_OpenSSL_add_all_algorithms(); -+} -+ -+ -+/*! -+ \internal -+*/ -+void QSslSocketPrivate::deinitialize() -+{ -+ q_CRYPTO_set_id_callback(0); -+ q_CRYPTO_set_locking_callback(0); -+ q_ERR_free_strings(); -+} -+ -+ -+bool QSslSocketPrivate::ensureLibraryLoaded() -+{ -+ if (!q_resolveOpenSslSymbols()) -+ return false; -+ -+ // Check if the library itself needs to be initialized. -+ QMutexLocker locker(openssl_locks()->initLock()); -+ -+ if (!s_libraryLoaded) { -+ s_libraryLoaded = true; -+ -+ // Initialize OpenSSL. -+ q_CRYPTO_set_id_callback(id_function); -+ q_CRYPTO_set_locking_callback(locking_function); -+ if (q_SSL_library_init() != 1) -+ return false; -+ q_SSL_load_error_strings(); -+ q_OpenSSL_add_all_algorithms_safe(); -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10001000L -+ if (q_SSLeay() >= 0x10001000L) -+ QSslSocketBackendPrivate::s_indexForSSLExtraData = q_SSL_get_ex_new_index(0L, NULL, NULL, NULL, NULL); -+#endif -+ -+ // Initialize OpenSSL's random seed. -+ if (!q_RAND_status()) { -+ qWarning("Random number generator not seeded, disabling SSL support"); -+ return false; -+ } -+ } -+ return true; -+} -+ -+void QSslSocketPrivate::ensureCiphersAndCertsLoaded() -+{ -+ QMutexLocker locker(openssl_locks()->initLock()); -+ if (s_loadedCiphersAndCerts) -+ return; -+ s_loadedCiphersAndCerts = true; -+ -+ resetDefaultCiphers(); -+ resetDefaultEllipticCurves(); -+ -+#if QT_CONFIG(library) -+ //load symbols needed to receive certificates from system store -+#if defined(Q_OS_WIN) -+ HINSTANCE hLib = LoadLibraryW(L"Crypt32"); -+ if (hLib) { -+ ptrCertOpenSystemStoreW = (PtrCertOpenSystemStoreW)GetProcAddress(hLib, "CertOpenSystemStoreW"); -+ ptrCertFindCertificateInStore = (PtrCertFindCertificateInStore)GetProcAddress(hLib, "CertFindCertificateInStore"); -+ ptrCertCloseStore = (PtrCertCloseStore)GetProcAddress(hLib, "CertCloseStore"); -+ if (!ptrCertOpenSystemStoreW || !ptrCertFindCertificateInStore || !ptrCertCloseStore) -+ qCWarning(lcSsl, "could not resolve symbols in crypt32 library"); // should never happen -+ } else { -+ qCWarning(lcSsl, "could not load crypt32 library"); // should never happen -+ } -+#elif defined(Q_OS_QNX) -+ s_loadRootCertsOnDemand = true; -+#elif defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) -+ // check whether we can enable on-demand root-cert loading (i.e. check whether the sym links are there) -+ QList dirs = unixRootCertDirectories(); -+ QStringList symLinkFilter; -+ symLinkFilter << QLatin1String("[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].[0-9]"); -+ for (int a = 0; a < dirs.count(); ++a) { -+ QDirIterator iterator(QLatin1String(dirs.at(a)), symLinkFilter, QDir::Files); -+ if (iterator.hasNext()) { -+ s_loadRootCertsOnDemand = true; -+ break; -+ } -+ } -+#endif -+#endif // QT_CONFIG(library) -+ // if on-demand loading was not enabled, load the certs now -+ if (!s_loadRootCertsOnDemand) -+ setDefaultCaCertificates(systemCaCertificates()); -+#ifdef Q_OS_WIN -+ //Enabled for fetching additional root certs from windows update on windows 6+ -+ //This flag is set false by setDefaultCaCertificates() indicating the app uses -+ //its own cert bundle rather than the system one. -+ //Same logic that disables the unix on demand cert loading. -+ //Unlike unix, we do preload the certificates from the cert store. -+ if ((QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) >= QSysInfo::WV_6_0) -+ s_loadRootCertsOnDemand = true; -+#endif -+} -+ -+long QSslSocketPrivate::sslLibraryVersionNumber() -+{ -+ if (!supportsSsl()) -+ return 0; -+ -+ return q_SSLeay(); -+} -+ -+QString QSslSocketPrivate::sslLibraryVersionString() -+{ -+ if (!supportsSsl()) -+ return QString(); -+ -+ const char *versionString = q_SSLeay_version(SSLEAY_VERSION); -+ if (!versionString) -+ return QString(); -+ -+ return QString::fromLatin1(versionString); -+} -+ -+void QSslSocketBackendPrivate::continueHandshake() -+{ -+ Q_Q(QSslSocket); -+ // if we have a max read buffer size, reset the plain socket's to match -+ if (readBufferMaxSize) -+ plainSocket->setReadBufferSize(readBufferMaxSize); -+ -+ if (q_SSL_ctrl((ssl), SSL_CTRL_GET_SESSION_REUSED, 0, NULL)) -+ configuration.peerSessionShared = true; -+ -+#ifdef QT_DECRYPT_SSL_TRAFFIC -+ if (ssl->session && ssl->s3) { -+ const char *mk = reinterpret_cast(ssl->session->master_key); -+ QByteArray masterKey(mk, ssl->session->master_key_length); -+ const char *random = reinterpret_cast(ssl->s3->client_random); -+ QByteArray clientRandom(random, SSL3_RANDOM_SIZE); -+ -+ // different format, needed for e.g. older Wireshark versions: -+// const char *sid = reinterpret_cast(ssl->session->session_id); -+// QByteArray sessionID(sid, ssl->session->session_id_length); -+// QByteArray debugLineRSA("RSA Session-ID:"); -+// debugLineRSA.append(sessionID.toHex().toUpper()); -+// debugLineRSA.append(" Master-Key:"); -+// debugLineRSA.append(masterKey.toHex().toUpper()); -+// debugLineRSA.append("\n"); -+ -+ QByteArray debugLineClientRandom("CLIENT_RANDOM "); -+ debugLineClientRandom.append(clientRandom.toHex().toUpper()); -+ debugLineClientRandom.append(" "); -+ debugLineClientRandom.append(masterKey.toHex().toUpper()); -+ debugLineClientRandom.append("\n"); -+ -+ QString sslKeyFile = QDir::tempPath() + QLatin1String("/qt-ssl-keys"); -+ QFile file(sslKeyFile); -+ if (!file.open(QIODevice::Append)) -+ qCWarning(lcSsl) << "could not open file" << sslKeyFile << "for appending"; -+ if (!file.write(debugLineClientRandom)) -+ qCWarning(lcSsl) << "could not write to file" << sslKeyFile; -+ file.close(); -+ } else { -+ qCWarning(lcSsl, "could not decrypt SSL traffic"); -+ } -+#endif -+ -+ // Cache this SSL session inside the QSslContext -+ if (!(configuration.sslOptions & QSsl::SslOptionDisableSessionSharing)) { -+ if (!sslContextPointer->cacheSession(ssl)) { -+ sslContextPointer.clear(); // we could not cache the session -+ } else { -+ // Cache the session for permanent usage as well -+ if (!(configuration.sslOptions & QSsl::SslOptionDisableSessionPersistence)) { -+ if (!sslContextPointer->sessionASN1().isEmpty()) -+ configuration.sslSession = sslContextPointer->sessionASN1(); -+ configuration.sslSessionTicketLifeTimeHint = sslContextPointer->sessionTicketLifeTimeHint(); -+ } -+ } -+ } -+ -+#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) -+ -+ configuration.nextProtocolNegotiationStatus = sslContextPointer->npnContext().status; -+ if (sslContextPointer->npnContext().status == QSslConfiguration::NextProtocolNegotiationUnsupported) { -+ // we could not agree -> be conservative and use HTTP/1.1 -+ configuration.nextNegotiatedProtocol = QByteArrayLiteral("http/1.1"); -+ } else { -+ const unsigned char *proto = 0; -+ unsigned int proto_len = 0; -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+ if (q_SSLeay() >= 0x10002000L) { -+ q_SSL_get0_alpn_selected(ssl, &proto, &proto_len); -+ if (proto_len && mode == QSslSocket::SslClientMode) { -+ // Client does not have a callback that sets it ... -+ configuration.nextProtocolNegotiationStatus = QSslConfiguration::NextProtocolNegotiationNegotiated; -+ } -+ } -+ -+ if (!proto_len) { // Test if NPN was more lucky ... -+#else -+ { -+#endif -+ q_SSL_get0_next_proto_negotiated(ssl, &proto, &proto_len); -+ } -+ -+ if (proto_len) -+ configuration.nextNegotiatedProtocol = QByteArray(reinterpret_cast(proto), proto_len); -+ else -+ configuration.nextNegotiatedProtocol.clear(); -+ } -+#endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L -+ if (q_SSLeay() >= 0x10002000L && mode == QSslSocket::SslClientMode) { -+ EVP_PKEY *key; -+ if (q_SSL_get_server_tmp_key(ssl, &key)) -+ configuration.ephemeralServerKey = QSslKey(key, QSsl::PublicKey); -+ } -+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L ... -+ -+ connectionEncrypted = true; -+ emit q->encrypted(); -+ if (autoStartHandshake && pendingClose) { -+ pendingClose = false; -+ q->disconnectFromHost(); -+ } -+} -+ -+QT_END_NAMESPACE -diff --git a/qtbase/src/network/ssl/ssl.pri b/qtbase/src/network/ssl/ssl.pri -index d2b0c2d60d..2783effaf1 100644 ---- a/qtbase/src/network/ssl/ssl.pri -+++ b/qtbase/src/network/ssl/ssl.pri -@@ -60,13 +60,25 @@ qtConfig(ssl) { - HEADERS += ssl/qsslcontext_openssl_p.h \ - ssl/qsslsocket_openssl_p.h \ - ssl/qsslsocket_openssl_symbols_p.h -- SOURCES += ssl/qsslcertificate_openssl.cpp \ -- ssl/qsslcontext_openssl.cpp \ -+ SOURCES += ssl/qsslsocket_openssl_symbols.cpp \ - ssl/qssldiffiehellmanparameters_openssl.cpp \ -+ ssl/qsslcertificate_openssl.cpp \ - ssl/qsslellipticcurve_openssl.cpp \ - ssl/qsslkey_openssl.cpp \ - ssl/qsslsocket_openssl.cpp \ -- ssl/qsslsocket_openssl_symbols.cpp -+ ssl/qsslcontext_openssl.cpp -+ -+ qtConfig(opensslv11) { -+ HEADERS += ssl/qsslsocket_openssl11_symbols_p.h -+ SOURCES += ssl/qsslsocket_openssl11.cpp \ -+ ssl/qsslcontext_openssl11.cpp -+ -+ QMAKE_CXXFLAGS += -DOPENSSL_API_COMPAT=0x10100000L -+ } else { -+ HEADERS += ssl/qsslsocket_opensslpre11_symbols_p.h -+ SOURCES += ssl/qsslsocket_opensslpre11.cpp \ -+ ssl/qsslcontext_opensslpre11.cpp -+ } - - darwin:SOURCES += ssl/qsslsocket_mac_shared.cpp -