aboutsummaryrefslogtreecommitdiffstats
path: root/tools
AgeCommit message (Collapse)AuthorFilesLines
2019-04-04PER: Use proto_tree_add_bitmask... () for named bits.Anders Broman1-3/+3
Change-Id: I2f4258e2f4fd11c26bdc101e1375d0b5708610b7 Reviewed-on: https://code.wireshark.org/review/32713 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-04epan: Convert our PROTO_ITEM_ macros to inline functions.Gerald Combs2-2/+2
Convert our various PROTO_ITEM_ macros to inline functions and document them. Change-Id: I070b15d4f70d2189217a177ee8ba2740be36327c Reviewed-on: https://code.wireshark.org/review/32706 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-03Quiet output of make-version.plMoshe Kaplan1-9/+17
Change-Id: Iefd53ad630f1dabc154c5b5a940e58288a91aa6e Reviewed-on: https://code.wireshark.org/review/32623 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-04-03ASN.1: Use proto_tree_add_bitmask... () for named bits.Anders Broman1-13/+31
Change-Id: Ied0c91ea070ee76603e7ecb29d874e0c1a65892e Reviewed-on: https://code.wireshark.org/review/32684 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-02Windows: upgrade USBPcap to 1.3.0.0 and Npcap to 0.992Pascal Quantin1-6/+6
Change-Id: Ie27c2cb36dc90a20851f1e2c53c1af2220465a39 Reviewed-on: https://code.wireshark.org/review/32678 Reviewed-by: Pascal Quantin <pascal@wireshark.org> Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-03-31travis: fix missing msbuild output on WindowsPeter Wu1-32/+56
For some reason the CMake output to Python is missing, no matter how hard I try. Use an alternative approach instead where Python executes CMake and filters the output without relying on pipes in Bash. Change-Id: I21b8b709c3a944fbd3b07e7fac59702735dd83a4 Reviewed-on: https://code.wireshark.org/review/32628 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-03-18Windows: Switch to Npcap 0.991.Gerald Combs1-2/+2
Change-Id: I4f5d82bf0d205b9410db2098abe64dde1a33b21d Reviewed-on: https://code.wireshark.org/review/32473 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-03-18Windows: Start using a `vcpkg export` bundle.Gerald Combs1-8/+4
Create a library bundle using `vcpkg export ... --zip` as described at https://vcpkg.readthedocs.io/en/latest/users/integration/#export-command. The bundle includes the following packages: gettext 0.19-8 glib 2.52.3-13 libffi 3.1-4 libiconv 1.15-5 liblzma 5.2.4 libxml2 2.9.9-4 pcre 8.41-1 zlib 1.2.11-5 It also includes a CMake toolchain file which we might want to make use of in the future. This means we no longer compile Zlib locally. Update the CMake environment accordingly and remove zlib from win-setup.ps1. It includes PDBs, so add them to the PDB .zip. Change-Id: I0a94904a86d836e990019dab62af506573be1f35 Reviewed-on: https://code.wireshark.org/review/31377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-03-14Add -G Ninja to macos-setup.shJim Young1-1/+2
Let's suggest using cmake's Ninja generator if we're going to suggest using ninja. Change-Id: Ibc48bf0e2039c2bbc0d11d7b194bc7094c1e0ebf Reviewed-on: https://code.wireshark.org/review/32399 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-25macos-setup: Update our GMP build flags.Gerald Combs1-1/+2
Configure GMP with --enable-fat. Neither --with-libgcrypt nor --without-p11-kit appear to be supported, so don't pass those flags. Change-Id: Ib96e805064b95be72d5fa3bd28057a5092064d8a Reviewed-on: https://code.wireshark.org/review/32190 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-23Fix liblzma, liblz4, and libssh builds with minimum deployment version and SDK.Guy Harris1-4/+14
liblzma is used by libxml2, which is used by libwireshark, so we need it. It's build by xz, so we need to do the xz build with the minimum-version and SDK flags. liblz4 does its builds in its own unique way; it appears we need to set MOREFLAGS to include the relevant flas. libssh is built with CMake, so you have to do special magic to set the SDK path; do it by running cmake with the MACOSX_DEPLOYMENT_TARGET and SDKROOT environment variables. Change-Id: Ia588632e5047c4a8a22fe6ef3a0844cfe7722df2 Reviewed-on: https://code.wireshark.org/review/32171 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-02-22Install Qt 5.12.1 by default.Michael Tuexen1-2/+2
Change-Id: I0d6462e6e9593198a77ccaeb6db630dffa0ae625 Reviewed-on: https://code.wireshark.org/review/32164 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-02-22Add -D_FORTIFY_SOURCE=0 for C++ if we're using it for C.Guy Harris1-4/+4
Change-Id: Ideaba2faaa7b968947f7af90b41c40a8edb4d3c2 Reviewed-on: https://code.wireshark.org/review/32160 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-02-22Set CXXFLAGS and LDFLAGS for all libraries.Guy Harris1-9/+9
If a minimum version number is specified, we need them all built with that and with the selected SDK. Change-Id: I84b98c67c64da12d3a3b234a41991675a71aeb82 Reviewed-on: https://code.wireshark.org/review/32156 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-02-22Get rid of extra space between environment variable settings.Guy Harris1-2/+2
Change-Id: Ie200d728f4c98f37ad71a62218b82767cef660b2 Reviewed-on: https://code.wireshark.org/review/32152 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-02-22Get rid of duplicate setting of CFLAGS.Guy Harris1-1/+1
Change-Id: I6f46f6827d66fec58d43195a95888c9d8adf245a Reviewed-on: https://code.wireshark.org/review/32146 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-02-16ASN1: Also show root node for exports.Martin Mathieson1-4/+11
For now, only apply to nr-rrc. Change-Id: I9be4bc5c3af33acad76c0a24ac04547e5f302c73 Reviewed-on: https://code.wireshark.org/review/32058 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2019-02-15html2text: Fix our footnotes.Gerald Combs1-1/+1
Print <number>: <url> instead of <number>: <number>. Change-Id: I55fd668c8d5870dbd43868e91f9299d5d5580b3f Reviewed-on: https://code.wireshark.org/review/32048 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-15travis: fold msbuild output to remain below the 10k line limitPeter Wu1-0/+41
Fold messages by overwriting the same line via a carriage return), similar to Ninja. The full log will still contain all messages. Change-Id: I89cc7d10147ebd21f22d40c8d2c4481b1dd2ab56 Reviewed-on: https://code.wireshark.org/review/32024 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-15travis: improve cache handling on WindowsPeter Wu1-0/+86
The Travis casher Bash implementation for Windows has bugs. The workarounds only slow down the build further. Given the lack of feedback on the casher bugs from Travis CI, let's try to improve it. Hopefully this will avoid stalls during the cache step. The "cd .." and "cd build" hack is required due to an annoying bug: https://travis-ci.community/t/caching-is-broken-after-directory-changes/2279 Change-Id: Iae62aa7e9ef78815d240b91199acfe21549c1af7 Reviewed-on: https://code.wireshark.org/review/32023 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-15travis: avoid aborting the build on slow Qt installationsPeter Wu2-0/+73
Periodically report the installation status to avoid aborting the installation on slow Qt installations (possibly due to slow network?). Change-Id: I6b8b8db49f2268d557a5ca2e7b1f08b6ea801fd9 Reviewed-on: https://code.wireshark.org/review/32022 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-15Rename our .asciidoc files to .adocGerald Combs1-3/+3
As noted in "AsciiDoc Recommended Practices" at https://asciidoctor.org/docs/asciidoc-recommended-practices/, the AsciiDoc/Asciidoctor community seems to have settled on ".adoc" as a file extension and that's the one preferred by the Asciidoctor project. Update our filenames to match. Change-Id: I2d352623d42d65d950b64310c3655b0fd177ee8c Reviewed-on: https://code.wireshark.org/review/32037 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-08Windows: Upgrade Kerberos to 1.17-1.Gerald Combs1-7/+6
Rebuild with NODEBUG=1. Bug: 15491 Change-Id: I58764c40557c3b148c928d0460cb5d458147f52c Reviewed-on: https://code.wireshark.org/review/31936 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-06Windows: Upgrade Kerberos to 1.17.Gerald Combs1-4/+4
Recent versions of Kerberos are much easier to compile on Windows. Switch to version 1.17, compiled with Visual Studio 2017 and linked with the Universal CRT. Change-Id: I393d51666cd13255ee1419f2164d7fa59fe1c5cb Reviewed-on: https://code.wireshark.org/review/31919 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-04make-version.pl: Fix version variable checks.Gerald Combs1-3/+3
Use "defined" instead of checking the variable's value (which might be zero). Change-Id: Id24aa25971f73526761c9821846ac0abcf252978 Reviewed-on: https://code.wireshark.org/review/31882 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-04For ASN.1-based protocols, make sure protocol filter will match.Martin Mathieson1-1/+11
This is optional, and enabled by setting PROTO_ROOT_NAME to the name of the item in the OPT section of the .cnf file. For now, setting only in nr-rrc. Change-Id: Ibe96c7de982af0346af90bc0e095f20d1a7ac506 Reviewed-on: https://code.wireshark.org/review/31876 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2019-01-23Windows: upgrade Npcap to 0.99-r9Pascal Quantin1-4/+4
Change-Id: Ie2b90a448415d7b8637aac03cee07fa9e5ab217f Reviewed-on: https://code.wireshark.org/review/31691 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2019-01-18Windows: upgrade libxml2 to 2.9.9Pascal Quantin1-5/+5
Change-Id: I0496974b09e9183879e2f1421e69aab06040d23a Reviewed-on: https://code.wireshark.org/review/31585 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2019-01-18macos-setup.sh: Bump our libxml2 version.Gerald Combs1-1/+1
Libxml2 2.9.9 was recently released and fixes a couple of security flaws. Change-Id: I59865a35c97e05d7bf41ca9b7688c3dd89507a66 Reviewed-on: https://code.wireshark.org/review/31578 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-17make-version.pl: Add a comment about version.h.Gerald Combs1-0/+3
Note that we might want to give CMakeLists.txt the ability to generate version.h independently. Change-Id: I4864504790aee4c40805f5ae3584db027a2762f5 Reviewed-on: https://code.wireshark.org/review/31569 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-15make-version.pl updates.Gerald Combs1-152/+185
Read our major, minor, and micro versions from CMakeLists.txt. Add the ability to set our extra version information differently if our Git commit is tagged or untagged. Change our extra version placeholder from "%#" to "{vcsinfo}". Add --tagged-version-extra (-t) and --untagged-version-extra (-u) arguments for specifying the tagged and untagged extra formats. Add --force-extra (-f) so that we can force one format or the other. Require the major.minor.micro version to be specified when using --set-version (-v). Update appveyor.yml and the Developer's Guide to match the new behavior. Change-Id: I6e5d55470aff7e7c61e75f208e24c4105276905a Reviewed-on: https://code.wireshark.org/review/31479 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-14Windows: Use a c-ares DLL built with vcpkg.Gerald Combs1-4/+4
Update the Windows build environment to use c-ares packages built from a VS 2017 command prompt with set CARES_VERSION=1.15.0 vcpkg install c-ares:x86-windows c-ares:x64-windows vcpkg export c-ares:x86-windows --output=c-ares-%CARES_VERSION%-win32ws --zip vcpkg export c-ares:x64-windows --output=c-ares-%CARES_VERSION%-win64ws --zip The packages also include a PDB, so copy it to the build directory and add it to the PDB .zip. Change-Id: I1887ca89d897bea184144315219b366096519961 Reviewed-on: https://code.wireshark.org/review/31376 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-14RPM: remove dependency on the which utilityPeter Wu1-6/+8
It is not necessary to know the full path to a program. Instead use the 'type' shell builtin (part of POSIX) to detect availability. Change-Id: Id68b298625d389a1f7843f52f56312bf81d97b80 Reviewed-on: https://code.wireshark.org/review/31540 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-14tarball+RPM: Fetch our version from CMake.Gerald Combs1-85/+0
Move git-export-release.sh to packaging/source. Have the source and RPM packaging derive version information from CMake's VERSION variable. This brings them in line with the rest of our packaging and avoids having to read chicken entrails^W^Wgit output. Make sure we always generate wireshark.spec. Bug: 15359 Change-Id: I188efda489c94449a10a612abebf9c2872c305cb Reviewed-on: https://code.wireshark.org/review/31504 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-13tools/gitlab-ci: add missing packages for rpm builds.Dario Lombardo1-0/+3
Change-Id: I04e3414ff27e18db8c83581116f4099bbb696a08 Reviewed-on: https://code.wireshark.org/review/31516 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-12travis: initial Windows support with non-interactive Qt installerPeter Wu1-0/+92
The current preview release of Windows support on Travis lacks many packages (like Qt and Python 3) and is very much tied to git-bash (unlike AppVeyor which has a more native Windows experience). Several workarounds were necessary, such as reimplementing refreshenv, setting CMAKE_PROGRAM_PATH) and setting a supported language. See also https://travis-ci.community/t/feedback-from-windows-integration-for-a-cmake-qt-c-python-perl-project/1706 I wrote the Qt installer script originally for Qt 5.6, ported it to Qt 5.9.5 and finally updated it for 5.12, some comments could be outdated. Duration as measured for one x64 build: - 3m00s - restore cache (Qt and wireshark-libs) - 2m22s - choco install - 0m8s - pip install - 2m20s - cmake - 18m5s - build all - 0m20s - build test-programs - 5m34s - pytest -v - 2m46s - store cache (Qt and wireshark-libs) - (total duration about 36m) - (installing Qt 5.12.0 from scratch would add 7m) Cache size for extracted x64 build: wireshark-libs is 187M, Qt 604M. (179M and 516M for 32-bit respectively.) Change-Id: I9881ab6439e9ca99efad16a6c861862ab9d35252 Reviewed-on: https://code.wireshark.org/review/31454 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10Move make-version.pl to tools.Gerald Combs2-1/+744
Move make-version.pl to the tools directory. Change-Id: I7c3ec8951a682d45d650e3fdb1580d90bf19e8b4 Reviewed-on: https://code.wireshark.org/review/31473 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-09Add validate-clang-check script for Petri DishAlexis La Goutte1-0/+19
Launch clang-check -analyze for each file... Change-Id: Ic4132d563ccaa5d375f27d08366ba6fc052f095c Reviewed-on: https://code.wireshark.org/review/30482 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-01-09valgrind-wireshark: default to looking in run/ for our binaries.Jeff Morriss1-2/+2
If33a39c26714ebe699463d1c8c67469025767efb made this change for the other scripts. Change-Id: I158c1c2d0b564a115443e96a6d90733c2ffff071 Reviewed-on: https://code.wireshark.org/review/31459 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-04debian: add dh-python to debian deps.Dario Lombardo1-0/+1
Basic Ubuntu installation lacks it. Change-Id: I208952d15bd32a7813c20625fe94656fb71ae824 Reviewed-on: https://code.wireshark.org/review/31322 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2019-01-04commit-msg: accept commit messages with backslashesPeter Wu1-2/+2
Dash (/bin/sh on Ubuntu) treats backslashes specially in an echo command. This could fail the validate-commit.py script when '\r' or '\n' occur anywhere in a commit message. Change-Id: Icec2c1e8ad1b365b4326ecc6ba9667ac64866fdd Reviewed-on: https://code.wireshark.org/review/31368 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03Windows: use lua-unicode as built with VS 2017Peter Wu1-4/+4
These binaries were built by AppVeyor using VS 2017 (MSVC 19.16.27025.1) and replaces locally built binaries using VS 2015 (MSVC 19.0.24215.1). I believe that these are the same as both of them use VCRUNTIME140.dll and import the same symbols. Using a newer compiler should however remove any doubt of compatibility with VS 2017 and should address concerns from Anders and Graham. These files are actually the "msvc2017_*.zip" files from https://github.com/Lekensteyn/lua-unicode/releases/tag/5.2.4-release1 Change-Id: Ib3fdf4678267fa10c0729f98ae0ce3153ac278a4 Reviewed-on: https://code.wireshark.org/review/31307 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-02tools: fix trailing messages.Dario Lombardo1-3/+8
Change-Id: If4f213daaa27f51b1659939244945d9fdddc7772 Reviewed-on: https://code.wireshark.org/review/31309 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-01Fix asn2wrs.py: always add BASE_VAL64_STRINGChristophe GUERBER1-6/+2
In some cases (e.g. when a field has a user defined dissection function) the type reported for this field is a 'virtual' one and the latter is not contained in selt.type. Consequently, BASE_VAL64_STRING is not set. Function eth_get_type_attr should return all the attributes of a type and it seems resonable to expect it to return the BASE_VAL64_STRING. This will solve the above mentioned error and may solve any possible issue in other parts that call this function. Change-Id: Iaee9ce5bd30f2a768cfcecf628df23bf1ed54e55 Reviewed-on: https://code.wireshark.org/review/31287 Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-31asn2wrs.py: use BASE_VAL64_STRING and val64_stringChristophe GUERBER1-5/+24
When UINT64 contains value strings, in addition to using VALS64 to give the list of names, the type of the structure has to be val64_string and the display parameter has to be ORed with BASE_VAL64_STRING. Change-Id: I0a619c91027df1eaae8209ada816f45b85d6431d Reviewed-on: https://code.wireshark.org/review/31268 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-31Windows: Upgrade GnuTLS to 1.6.3Peter Wu1-5/+3
Upgrade to GnuTLS 3.6.3-1, using MinGW binaries from Fedora 29 packages: mingw64-gnutls-3.6.3-1.fc29.noarch.rpm mingw64-gcc-8.2.0-3.fc29.x86_64.rpm mingw64-gmp-6.1.2-4.fc29.noarch.rpm mingw64-nettle-3.4-2.fc29.noarch.rpm mingw64-p11-kit-0.23.7-5.fc29.noarch.rpm mingw64-libffi-3.1-4.fc29.noarch.rpm mingw64-libtasn1-4.13-3.fc29.noarch.rpm mingw64-winpthreads-5.0.4-2.fc29.noarch.rpm This includes libgcc_s_seh-1.dll (64-bit, new) and libgcc_s_sjlj-1.dll (32-bit, previously included with glib2). Built with https://git.lekensteyn.nl/peter/wireshark-notes/tree/windows-libs/make-gnutls-libs-zip.sh?id=b86878e458d5d7deb21218ce6598b98af4ed7ec2 The main motivation is improved PKCS #11 support: - 3.6.0: fix potential compatibility issue with SafeNet HSMs https://gitlab.com/gnutls/gnutls/merge_requests/398/ - 3.6.2: gnutls_pkcs11_token_get_flags now forwards token info. - 3.6.3: new APIs for low-level PKCS #11 token or object operations. Change-Id: I235774e3b27f3426cb74d3d9c0ab593d06870e89 Reviewed-on: https://code.wireshark.org/review/31128 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-30asn2wrs.py: fix regression introduced by gf4b0b2109Pascal Quantin1-1/+2
FT_(U)INT64 are restricted to integer types only currently. Do not use VALS64() for other types. Change-Id: Id2299a9291c53ef246b90d732eb84811510ccb85 Reviewed-on: https://code.wireshark.org/review/31257 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-12-30Fixes ASN.1 generation for VALS using 64 bitsChristophe GUERBER1-1/+4
VALS generation did not take into account the constraints on integers. We now generate VALS if no constraints are present and VALS64 if the interger needs 64 bits. Change-Id: Ia044ee1ba1bd5b45554c19a458876e20110b1b7f Reviewed-on: https://code.wireshark.org/review/31252 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-29Add support for RSA decryption using PKCS #11 tokensPeter Wu1-12/+39
Add support for loading RSA private key files from PKCS #11 tokens, identified by PKCS #11 URIs. Add a new 'pkcs11_libs' UAT which can dynamically load PKCS #11 provider libraries that are not found by p11-kit. The configuration GUI will need additional code to discover available PKCS #11 tokens and will be added later. This feature requires GnuTLS 3.4 with PKCS #11 support, so Windows, macOS via Homebrew, Ubuntu 16.04, Debian Stretch. Not supported: RHEL7. Currently macOS via official packages disables PKCS #11 support, so that will also not work. Change-Id: I20646bfd69c6bd13c8c2d27cb65c164a4b0b7a66 Reviewed-on: https://code.wireshark.org/review/30855 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-29Windows: fix handling of Unicode paths in LuaPeter Wu1-6/+6
Lua internally uses ANSI C APIs (such as fopen). On many systems (macOS and Linux for example) these work fine with UTF-8. Windows however requires special Unicode APIs (such as _wfopen), so patch the Lua library to interpret paths are UTF-8 and call appropriate Unicode APIs. Changes compared to the previous LuaBinaries zip archive: - Patched with UTF-8 support for loadfile, os.execute, etc. - Built with VS 2015 (VCRUNTIME140.dll) instead of MinGW (MSVCRT.dll). - Includes PDB file for lua52.dll - Includes lua52.exe and luac52.exe with UTF-8 argv support (wmain). - Includes build scripts, source files and README.md. - Extra subdirectory named after the zip file. These zip files are taken from https://github.com/Lekensteyn/lua-unicode (the "prepared" source zips can be found here as well.) Bug: 15118 Change-Id: I219f046d6e0fd5093287b5d6503a48ba7d1fc6a4 Reviewed-on: https://code.wireshark.org/review/31165 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 07:24:44 +0000