Skip to content

Commit 51f5c84

Browse files
berrangestsquad
authored andcommitted
hw/usb/ccid: remove references to NSS
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 7b02f54 Author: Marc-André Lureau <[email protected]> Date: Sun Aug 30 11:48:40 2015 +0200 libcacard: use the standalone project Signed-off-by: Daniel P. Berrangé <[email protected]> Signed-off-by: Alex Bennée <[email protected]> Reviewed-by: Wainer dos Santos Moschetta <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Willian Rampazzo <[email protected]> Reviewed-by: Alex Bennée <[email protected]> Message-Id: <[email protected]> Message-Id: <[email protected]>
1 parent b92da9a commit 51f5c84

File tree

7 files changed

+14
-19
lines changed

7 files changed

+14
-19
lines changed

.travis.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ addons:
2727
- libattr1-dev
2828
- libbrlapi-dev
2929
- libcap-ng-dev
30+
- libcacard-dev
3031
- libgcc-7-dev
3132
- libgnutls28-dev
3233
- libgtk-3-dev
3334
- libiscsi-dev
3435
- liblttng-ust-dev
3536
- libncurses5-dev
3637
- libnfs-dev
37-
- libnss3-dev
3838
- libpixman-1-dev
3939
- libpng-dev
4040
- librados-dev
@@ -129,6 +129,7 @@ jobs:
129129
- libaio-dev
130130
- libattr1-dev
131131
- libbrlapi-dev
132+
- libcacard-dev
132133
- libcap-ng-dev
133134
- libgcrypt20-dev
134135
- libgnutls28-dev
@@ -137,7 +138,6 @@ jobs:
137138
- liblttng-ust-dev
138139
- libncurses5-dev
139140
- libnfs-dev
140-
- libnss3-dev
141141
- libpixman-1-dev
142142
- libpng-dev
143143
- librados-dev
@@ -163,6 +163,7 @@ jobs:
163163
- libaio-dev
164164
- libattr1-dev
165165
- libbrlapi-dev
166+
- libcacard-dev
166167
- libcap-ng-dev
167168
- libgcrypt20-dev
168169
- libgnutls28-dev
@@ -171,7 +172,6 @@ jobs:
171172
- liblttng-ust-dev
172173
- libncurses5-dev
173174
- libnfs-dev
174-
- libnss3-dev
175175
- libpixman-1-dev
176176
- libpng-dev
177177
- librados-dev
@@ -196,6 +196,7 @@ jobs:
196196
- libaio-dev
197197
- libattr1-dev
198198
- libbrlapi-dev
199+
- libcacard-dev
199200
- libcap-ng-dev
200201
- libgcrypt20-dev
201202
- libgnutls28-dev
@@ -204,7 +205,6 @@ jobs:
204205
- liblttng-ust-dev
205206
- libncurses5-dev
206207
- libnfs-dev
207-
- libnss3-dev
208208
- libpixman-1-dev
209209
- libpng-dev
210210
- librados-dev
@@ -238,14 +238,14 @@ jobs:
238238
apt_packages:
239239
- libaio-dev
240240
- libattr1-dev
241+
- libcacard-dev
241242
- libcap-ng-dev
242243
- libgnutls28-dev
243244
- libiscsi-dev
244245
- liblttng-ust-dev
245246
- liblzo2-dev
246247
- libncurses-dev
247248
- libnfs-dev
248-
- libnss3-dev
249249
- libpixman-1-dev
250250
- libsdl2-dev
251251
- libsdl2-image-dev
@@ -281,6 +281,7 @@ jobs:
281281
- libaio-dev
282282
- libattr1-dev
283283
- libbrlapi-dev
284+
- libcacard-dev
284285
- libcap-ng-dev
285286
- libgcrypt20-dev
286287
- libgnutls28-dev
@@ -289,7 +290,6 @@ jobs:
289290
- liblttng-ust-dev
290291
- libncurses5-dev
291292
- libnfs-dev
292-
- libnss3-dev
293293
- libpixman-1-dev
294294
- libpng-dev
295295
- librados-dev

docs/ccid.txt

+7-8
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,14 @@ reader and smart card (i.e. not backed by a physical device) using this device.
3434

3535
2. Building
3636

37-
The cryptographic functions and access to the physical card is done via NSS.
38-
39-
Installing NSS:
37+
The cryptographic functions and access to the physical card is done via the
38+
libcacard library, whose development package must be installed prior to
39+
building QEMU:
4040

4141
In redhat/fedora:
42-
yum install nss-devel
43-
In ubuntu/debian:
44-
apt-get install libnss3-dev
45-
(not tested on ubuntu)
42+
yum install libcacard-devel
43+
In ubuntu:
44+
apt-get install libcacard-dev
4645

4746
Configuring and building:
4847
./configure --enable-smartcard && make
@@ -51,7 +50,7 @@ Configuring and building:
5150
3. Using ccid-card-emulated with hardware
5251

5352
Assuming you have a working smartcard on the host with the current
54-
user, using NSS, qemu acts as another NSS client using ccid-card-emulated:
53+
user, using libcacard, QEMU acts as another client using ccid-card-emulated:
5554

5655
qemu -usb -device usb-ccid -device ccid-card-emulated
5756

scripts/coverity-scan/coverity-scan.docker

-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ ENV PACKAGES \
9393
mingw64-SDL2 \
9494
ncurses-devel \
9595
nettle-devel \
96-
nss-devel \
9796
numactl-devel \
9897
perl \
9998
perl-Test-Harness \

tests/docker/dockerfiles/fedora.docker

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ ENV PACKAGES \
2828
libasan \
2929
libattr-devel \
3030
libblockdev-mpath-devel \
31+
libcacard-devel \
3132
libcap-ng-devel \
3233
libcurl-devel \
3334
libepoxy-devel \
@@ -82,7 +83,6 @@ ENV PACKAGES \
8283
ncurses-devel \
8384
nettle-devel \
8485
ninja-build \
85-
nss-devel \
8686
numactl-devel \
8787
perl \
8888
perl-Test-Harness \

tests/docker/dockerfiles/ubuntu.docker

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ ENV PACKAGES \
4040
libncurses5-dev \
4141
libncursesw5-dev \
4242
libnfs-dev \
43-
libnss3-dev \
4443
libnuma-dev \
4544
libpixman-1-dev \
4645
libpng-dev \

tests/docker/dockerfiles/ubuntu1804.docker

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ ENV PACKAGES \
2727
libncurses5-dev \
2828
libncursesw5-dev \
2929
libnfs-dev \
30-
libnss3-dev \
3130
libnuma-dev \
3231
libpixman-1-dev \
3332
librados-dev \

tests/docker/dockerfiles/ubuntu2004.docker

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ ENV PACKAGES flex bison \
3131
libncurses5-dev \
3232
libncursesw5-dev \
3333
libnfs-dev \
34-
libnss3-dev \
3534
libnuma-dev \
3635
libpixman-1-dev \
3736
librados-dev \

0 commit comments

Comments
 (0)