diff options
author | Peter Wu <peter@lekensteyn.nl> | 2018-12-12 14:34:00 +0100 |
---|---|---|
committer | Peter Wu <peter@lekensteyn.nl> | 2018-12-29 10:40:16 +0000 |
commit | ac58eafa3223ef40b9b60765b0b3d118f338fffc (patch) | |
tree | 8403b9749b31cd0f3a1baab3f5dac1072980f1ae /appveyor.yml | |
parent | 53d8e6dcf8c639a13f8c52a11df829b854c1b9ac (diff) |
Add support for RSA decryption using PKCS #11 tokens
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>
Diffstat (limited to 'appveyor.yml')
-rw-r--r-- | appveyor.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/appveyor.yml b/appveyor.yml index c20b82735c..82059e4dc6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,6 +29,9 @@ install: # Py2 fails the test_tshark_unicode_display_filter test, so use Py3. - set PATH=C:\Python37-x64;C:\Python37-x64\Scripts;%PATH% - pip install pytest pytest-xdist + - ps: | # For pkcs11 tests. + Invoke-WebRequest -Uri https://github.com/disig/SoftHSM2-for-Windows/releases/download/v2.5.0/SoftHSM2-2.5.0.msi -OutFile $Env:WIRESHARK_BASE_DIR\SoftHSM2-2.5.0.msi + & msiexec /qn /i $Env:WIRESHARK_BASE_DIR\SoftHSM2-2.5.0.msi # Note: the NSIS installer lacks debug dlls for Debug builds. configuration: RelWithDebInfo |