[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/3] hw/usb/ccid: remove references to NSS
From: |
Daniel P . Berrangé |
Subject: |
[PATCH 1/3] hw/usb/ccid: remove references to NSS |
Date: |
Wed, 4 Nov 2020 13:19:22 +0000 |
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>
---
.travis.yml | 14 +++++++-------
docs/ccid.txt | 15 +++++++--------
scripts/coverity-scan/coverity-scan.docker | 1 -
tests/docker/dockerfiles/centos7.docker | 1 +
tests/docker/dockerfiles/centos8.docker | 1 +
tests/docker/dockerfiles/fedora.docker | 2 +-
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index a3d78171ca..2bd2cfd0ba 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
@@ -268,6 +268,7 @@ jobs:
- libaio-dev
- libattr1-dev
- libbrlapi-dev
+ - libcacard-dev
- libcap-ng-dev
- libgnutls28-dev
- libgtk-3-dev
@@ -275,7 +276,6 @@ jobs:
- liblttng-ust-dev
- libnfs-dev
- libncurses5-dev
- - libnss3-dev
- libpixman-1-dev
- libpng-dev
- librados-dev
@@ -335,6 +335,7 @@ jobs:
- libaio-dev
- libattr1-dev
- libbrlapi-dev
+ - libcacard-dev
- libcap-ng-dev
- libgcrypt20-dev
- libgnutls28-dev
@@ -343,7 +344,6 @@ jobs:
- liblttng-ust-dev
- libncurses5-dev
- libnfs-dev
- - libnss3-dev
- libpixman-1-dev
- libpng-dev
- librados-dev
@@ -369,6 +369,7 @@ jobs:
- libaio-dev
- libattr1-dev
- libbrlapi-dev
+ - libcacard-dev
- libcap-ng-dev
- libgcrypt20-dev
- libgnutls28-dev
@@ -377,7 +378,6 @@ jobs:
- liblttng-ust-dev
- libncurses5-dev
- libnfs-dev
- - libnss3-dev
- libpixman-1-dev
- libpng-dev
- librados-dev
@@ -402,6 +402,7 @@ jobs:
- libaio-dev
- libattr1-dev
- libbrlapi-dev
+ - libcacard-dev
- libcap-ng-dev
- libgcrypt20-dev
- libgnutls28-dev
@@ -410,7 +411,6 @@ jobs:
- liblttng-ust-dev
- libncurses5-dev
- libnfs-dev
- - libnss3-dev
- libpixman-1-dev
- libpng-dev
- librados-dev
@@ -444,6 +444,7 @@ jobs:
apt_packages:
- libaio-dev
- libattr1-dev
+ - libcacard-dev
- libcap-ng-dev
- libgnutls28-dev
- libiscsi-dev
@@ -451,7 +452,6 @@ jobs:
- liblzo2-dev
- libncurses-dev
- libnfs-dev
- - libnss3-dev
- libpixman-1-dev
- libsdl2-dev
- libsdl2-image-dev
@@ -487,6 +487,7 @@ jobs:
- libaio-dev
- libattr1-dev
- libbrlapi-dev
+ - libcacard-dev
- libcap-ng-dev
- libgcrypt20-dev
- libgnutls28-dev
@@ -495,7 +496,6 @@ jobs:
- liblttng-ust-dev
- libncurses5-dev
- libnfs-dev
- - libnss3-dev
- libpixman-1-dev
- libpng-dev
- librados-dev
diff --git a/docs/ccid.txt b/docs/ccid.txt
index c7fda6d07d..1baf03e29b 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/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/centos7.docker
b/tests/docker/dockerfiles/centos7.docker
index 6f11af1989..d47c96135c 100644
--- a/tests/docker/dockerfiles/centos7.docker
+++ b/tests/docker/dockerfiles/centos7.docker
@@ -17,6 +17,7 @@ ENV PACKAGES \
glib2-devel \
gnutls-devel \
libaio-devel \
+ libcacard-devel \
libepoxy-devel \
libfdt-devel \
libgcrypt-devel \
diff --git a/tests/docker/dockerfiles/centos8.docker
b/tests/docker/dockerfiles/centos8.docker
index 54bc6d54cd..bbd82421db 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -13,6 +13,7 @@ ENV PACKAGES \
git \
glib2-devel \
libaio-devel \
+ libcacard-devel \
libepoxy-devel \
libgcrypt-devel \
lzo-devel \
diff --git a/tests/docker/dockerfiles/fedora.docker
b/tests/docker/dockerfiles/fedora.docker
index 0b5053f2d0..29859beee3 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -28,6 +28,7 @@ ENV PACKAGES \
libattr-devel \
libblockdev-mpath-devel \
libcap-ng-devel \
+ libcacard-devel \
libcurl-devel \
libepoxy-devel \
libfdt-devel \
@@ -77,7 +78,6 @@ ENV PACKAGES \
ncurses-devel \
nettle-devel \
ninja-build \
- nss-devel \
numactl-devel \
perl \
perl-Test-Harness \
--
2.28.0