From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, "Peter Maydell" <peter.maydell@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
berrange@redhat.com, "Alex Bennée" <alex.bennee@linaro.org>,
f4bug@amsat.org,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Willian Rampazzo" <willianr@redhat.com>,
stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
aurelien@aurel32.net
Subject: [PATCH v1 09/39] hw/usb/ccid: remove references to NSS
Date: Tue, 6 Jul 2021 15:57:47 +0100 [thread overview]
Message-ID: <20210706145817.24109-10-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org>
From: Daniel P. Berrangé <berrange@redhat.com>
The NSS package was previously pre-requisite for building CCID related
features, however, this became obsolete when the libcacard library was
spun off to a separate project:
commit 7b02f5447c64d1854468f758398c9f6fe9e5721f
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Sun Aug 30 11:48:40 2015 +0200
libcacard: use the standalone project
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210623142245.307776-2-berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
docs/ccid.txt | 15 +++++++--------
.travis.yml | 12 ++++++------
scripts/coverity-scan/coverity-scan.docker | 1 -
tests/docker/dockerfiles/fedora.docker | 2 +-
tests/docker/dockerfiles/ubuntu.docker | 1 -
tests/docker/dockerfiles/ubuntu1804.docker | 1 -
tests/docker/dockerfiles/ubuntu2004.docker | 1 -
7 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/docs/ccid.txt b/docs/ccid.txt
index c97fbd2de0..2b85b1bd42 100644
--- a/docs/ccid.txt
+++ b/docs/ccid.txt
@@ -34,15 +34,14 @@ reader and smart card (i.e. not backed by a physical device) using this device.
2. Building
-The cryptographic functions and access to the physical card is done via NSS.
-
-Installing NSS:
+The cryptographic functions and access to the physical card is done via the
+libcacard library, whose development package must be installed prior to
+building QEMU:
In redhat/fedora:
- yum install nss-devel
-In ubuntu/debian:
- apt-get install libnss3-dev
- (not tested on ubuntu)
+ yum install libcacard-devel
+In ubuntu:
+ apt-get install libcacard-dev
Configuring and building:
./configure --enable-smartcard && make
@@ -51,7 +50,7 @@ Configuring and building:
3. Using ccid-card-emulated with hardware
Assuming you have a working smartcard on the host with the current
-user, using NSS, qemu acts as another NSS client using ccid-card-emulated:
+user, using libcacard, QEMU acts as another client using ccid-card-emulated:
qemu -usb -device usb-ccid -device ccid-card-emulated
diff --git a/.travis.yml b/.travis.yml
index 4609240b5a..0faddf7b4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ addons:
- libattr1-dev
- libbrlapi-dev
- libcap-ng-dev
+ - libcacard-dev
- libgcc-7-dev
- libgnutls28-dev
- libgtk-3-dev
@@ -34,7 +35,6 @@ addons:
- liblttng-ust-dev
- libncurses5-dev
- libnfs-dev
- - libnss3-dev
- libpixman-1-dev
- libpng-dev
- librados-dev
@@ -129,6 +129,7 @@ jobs:
- libaio-dev
- libattr1-dev
- libbrlapi-dev
+ - libcacard-dev
- libcap-ng-dev
- libgcrypt20-dev
- libgnutls28-dev
@@ -137,7 +138,6 @@ jobs:
- liblttng-ust-dev
- libncurses5-dev
- libnfs-dev
- - libnss3-dev
- libpixman-1-dev
- libpng-dev
- librados-dev
@@ -163,6 +163,7 @@ jobs:
- libaio-dev
- libattr1-dev
- libbrlapi-dev
+ - libcacard-dev
- libcap-ng-dev
- libgcrypt20-dev
- libgnutls28-dev
@@ -171,7 +172,6 @@ jobs:
- liblttng-ust-dev
- libncurses5-dev
- libnfs-dev
- - libnss3-dev
- libpixman-1-dev
- libpng-dev
- librados-dev
@@ -196,6 +196,7 @@ jobs:
- libaio-dev
- libattr1-dev
- libbrlapi-dev
+ - libcacard-dev
- libcap-ng-dev
- libgcrypt20-dev
- libgnutls28-dev
@@ -204,7 +205,6 @@ jobs:
- liblttng-ust-dev
- libncurses5-dev
- libnfs-dev
- - libnss3-dev
- libpixman-1-dev
- libpng-dev
- librados-dev
@@ -238,6 +238,7 @@ jobs:
apt_packages:
- libaio-dev
- libattr1-dev
+ - libcacard-dev
- libcap-ng-dev
- libgnutls28-dev
- libiscsi-dev
@@ -245,7 +246,6 @@ jobs:
- liblzo2-dev
- libncurses-dev
- libnfs-dev
- - libnss3-dev
- libpixman-1-dev
- libsdl2-dev
- libsdl2-image-dev
@@ -281,6 +281,7 @@ jobs:
- libaio-dev
- libattr1-dev
- libbrlapi-dev
+ - libcacard-dev
- libcap-ng-dev
- libgcrypt20-dev
- libgnutls28-dev
@@ -289,7 +290,6 @@ jobs:
- liblttng-ust-dev
- libncurses5-dev
- libnfs-dev
- - libnss3-dev
- libpixman-1-dev
- libpng-dev
- librados-dev
diff --git a/scripts/coverity-scan/coverity-scan.docker b/scripts/coverity-scan/coverity-scan.docker
index 501ac67233..ecff6ac5b4 100644
--- a/scripts/coverity-scan/coverity-scan.docker
+++ b/scripts/coverity-scan/coverity-scan.docker
@@ -93,7 +93,6 @@ ENV PACKAGES \
mingw64-SDL2 \
ncurses-devel \
nettle-devel \
- nss-devel \
numactl-devel \
perl \
perl-Test-Harness \
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 00cac5d61c..9dde3f6a78 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -28,6 +28,7 @@ ENV PACKAGES \
libasan \
libattr-devel \
libblockdev-mpath-devel \
+ libcacard-devel \
libcap-ng-devel \
libcurl-devel \
libepoxy-devel \
@@ -82,7 +83,6 @@ ENV PACKAGES \
ncurses-devel \
nettle-devel \
ninja-build \
- nss-devel \
numactl-devel \
perl \
perl-Test-Harness \
diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
index 24d1647a65..100cfa76e3 100644
--- a/tests/docker/dockerfiles/ubuntu.docker
+++ b/tests/docker/dockerfiles/ubuntu.docker
@@ -40,7 +40,6 @@ ENV PACKAGES \
libncurses5-dev \
libncursesw5-dev \
libnfs-dev \
- libnss3-dev \
libnuma-dev \
libpixman-1-dev \
libpng-dev \
diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
index 2f1ec7c42b..86114be23a 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -27,7 +27,6 @@ ENV PACKAGES \
libncurses5-dev \
libncursesw5-dev \
libnfs-dev \
- libnss3-dev \
libnuma-dev \
libpixman-1-dev \
librados-dev \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index fe993fe2a3..b33ed139d9 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -31,7 +31,6 @@ ENV PACKAGES flex bison \
libncurses5-dev \
libncursesw5-dev \
libnfs-dev \
- libnss3-dev \
libnuma-dev \
libpixman-1-dev \
librados-dev \
--
2.20.1
next prev parent reply other threads:[~2021-07-06 15:08 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-06 14:57 [PATCH v1 00/39] final pre-PR for 6.1 (testing and plugins) Alex Bennée
2021-07-06 14:57 ` [PATCH v1 01/39] Jobs based on custom runners: documentation and configuration placeholder Alex Bennée
2021-07-06 14:57 ` [PATCH v1 02/39] Jobs based on custom runners: build environment docs and playbook Alex Bennée
2021-07-06 14:57 ` [PATCH v1 03/39] Jobs based on custom runners: docs and gitlab-runner setup playbook Alex Bennée
2021-07-06 14:57 ` [PATCH v1 04/39] Jobs based on custom runners: add job definitions for QEMU's machines Alex Bennée
2021-07-06 14:57 ` [PATCH v1 05/39] tests/tcg: generalise the disabling of the signals test Alex Bennée
2021-07-08 15:29 ` Peter Maydell
2021-07-06 14:57 ` [PATCH v1 06/39] build: validate that system capstone works before using it Alex Bennée
2021-07-06 14:57 ` [PATCH v1 07/39] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run Alex Bennée
2021-07-06 14:57 ` [PATCH v1 08/39] cirrus: delete FreeBSD and macOS jobs Alex Bennée
2021-07-06 14:57 ` Alex Bennée [this message]
2021-07-06 14:57 ` [PATCH v1 10/39] tests/docker: don't use BUILDKIT in GitLab either Alex Bennée
2021-07-06 14:57 ` [PATCH v1 11/39] tests/docker: use project specific container registries Alex Bennée
2021-07-06 14:57 ` [PATCH v1 12/39] tests/docker: use explicit docker.io registry Alex Bennée
2021-07-06 14:57 ` [PATCH v1 13/39] tests/docker: remove FEATURES env var from templates Alex Bennée
2021-07-06 14:57 ` [PATCH v1 14/39] tests/docker: fix sorting in package lists Alex Bennée
2021-07-06 14:57 ` [PATCH v1 15/39] tests/docker: fix mistakes in centos " Alex Bennée
2021-07-06 14:57 ` [PATCH v1 16/39] tests/docker: fix mistakes in fedora package list Alex Bennée
2021-07-06 14:57 ` [PATCH v1 17/39] tests/docker: fix mistakes in ubuntu package lists Alex Bennée
2021-07-07 14:41 ` Philippe Mathieu-Daudé
2021-07-07 14:49 ` Daniel P. Berrangé
2021-07-06 14:57 ` [PATCH v1 18/39] tests/docker: remove mingw packages from Fedora Alex Bennée
2021-07-06 14:57 ` [PATCH v1 19/39] tests/docker: expand centos8 package list Alex Bennée
2021-07-06 14:57 ` [PATCH v1 20/39] tests/docker: expand fedora " Alex Bennée
2021-07-06 14:57 ` [PATCH v1 21/39] tests/docker: expand ubuntu1804 " Alex Bennée
2021-07-06 14:58 ` [PATCH v1 22/39] tests/docker: expand ubuntu2004 " Alex Bennée
2021-07-06 14:58 ` [PATCH v1 23/39] tests/docker: expand opensuse-leap " Alex Bennée
2021-07-06 14:58 ` [PATCH v1 24/39] tests/vm: update NetBSD to 9.2 Alex Bennée
2021-07-06 14:58 ` [PATCH v1 25/39] tests/vm: update openbsd to release 6.9 Alex Bennée
2021-07-06 14:58 ` [PATCH v1 26/39] tests/tcg: make test-mmap a little less aggressive Alex Bennée
2021-07-06 14:58 ` [PATCH v1 27/39] plugins: fix-up handling of internal hostaddr for 32 bit Alex Bennée
2021-07-06 14:58 ` [PATCH v1 28/39] meson.build: move TCG plugin summary output Alex Bennée
2021-07-06 14:58 ` [PATCH v1 29/39] configure: don't allow plugins to be enabled for a non-TCG build Alex Bennée
2021-07-07 4:17 ` Thomas Huth
2021-07-06 14:58 ` [PATCH v1 30/39] configure: stop user enabling plugins on Windows for now Alex Bennée
2021-07-07 4:24 ` Thomas Huth
2021-07-06 14:58 ` [PATCH v1 31/39] tcg/plugins: enable by default for TCG builds Alex Bennée
2021-07-07 4:32 ` Thomas Huth
2021-07-06 14:58 ` [PATCH v1 32/39] contrib/plugins: enable -Wall for building plugins Alex Bennée
2021-07-07 4:36 ` Thomas Huth
2021-07-06 14:58 ` [PATCH v1 33/39] contrib/plugins: add execlog to log instruction execution and memory access Alex Bennée
2021-07-06 14:58 ` [PATCH v1 34/39] docs/devel: tcg-plugins: add execlog plugin description Alex Bennée
2021-07-06 14:58 ` [PATCH v1 35/39] plugins: Added a new cache modelling plugin Alex Bennée
2021-07-06 14:58 ` [PATCH v1 36/39] plugins/cache: Enable cache parameterization Alex Bennée
2021-07-06 14:58 ` [PATCH v1 37/39] plugins/cache: Added FIFO and LRU eviction policies Alex Bennée
2021-07-06 14:58 ` [PATCH v1 38/39] docs/devel: Added cache plugin to the plugins docs Alex Bennée
2021-07-06 14:58 ` [PATCH v1 39/39] MAINTAINTERS: Added myself as a reviewer for TCG Plugins Alex Bennée
2021-07-06 15:35 ` Peter Maydell
2021-07-07 8:33 ` [PATCH v1 00/39] final pre-PR for 6.1 (testing and plugins) Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210706145817.24109-10-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=crosa@redhat.com \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=willianr@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.