summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/opensc
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-09-05 12:33:28 -0700
committerKhem Raj <raj.khem@gmail.com>2018-09-08 13:32:12 -0700
commit79d66aea14dc3d60457c6dd41ceabd1dfcee3401 (patch)
tree376149fc4611f152f3c456e66df9d9c8e550271f /meta-oe/recipes-support/opensc
parent492ac5ceafebae788a750447a38279fbcabeac14 (diff)
downloadmeta-openembedded-79d66aea14dc3d60457c6dd41ceabd1dfcee3401.tar.gz
opensc: Upgrade to 0.18.0
* Fixes build with OpenSSL 1.1.x * Fix build with gcc8 Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/opensc')
-rw-r--r--meta-oe/recipes-support/opensc/opensc/0001-Fixed-gcc-8-compilation-errors-1353.patch73
-rw-r--r--meta-oe/recipes-support/opensc/opensc_0.18.0.bb (renamed from meta-oe/recipes-support/opensc/opensc_0.16.0.bb)9
2 files changed, 79 insertions, 3 deletions
diff --git a/meta-oe/recipes-support/opensc/opensc/0001-Fixed-gcc-8-compilation-errors-1353.patch b/meta-oe/recipes-support/opensc/opensc/0001-Fixed-gcc-8-compilation-errors-1353.patch
new file mode 100644
index 000000000..48d832754
--- /dev/null
+++ b/meta-oe/recipes-support/opensc/opensc/0001-Fixed-gcc-8-compilation-errors-1353.patch
@@ -0,0 +1,73 @@
1From 87857d5cae7db94fdd776904886392b1e86053bd Mon Sep 17 00:00:00 2001
2From: Florian Bezdeka <1119693+fbezdeka@users.noreply.github.com>
3Date: Fri, 18 May 2018 18:54:56 +0200
4Subject: [PATCH] Fixed gcc 8 compilation errors (#1353)
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9The following errors occured during a compilation using gcc 8:
10
11In function »gids_create_file.constprop«,
12 inserted by »gids_save_certificate.isra.8« beicard-gids.c:1548:7:
13card-gids.c:465:2: Error: »strncpy« output may be truncated copying 8 bytes from a string of length 8 [-Werror=stringop-truncation]
14 strncpy(record->filename, filename, 8);
15 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16
17pkcs15-oberthur.c: In function »sc_pkcs15emu_oberthur_add_prvkey«:
18pkcs15-oberthur.c:741:5: Error: »strncpy« output may be truncated copying 254 bytes from a string of length 254 [-Werror=stringop-truncation]
19 strncpy(kobj.label, objs[ii]->label, sizeof(kobj.label) - 1);
20 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
21
22Upstream-Status: Backport [https://github.com/OpenSC/OpenSC/pull/1353]
23Signed-off-by Khem Raj <raj.khem@gmail.com>
24---
25 src/libopensc/card-gids.c | 3 ++-
26 src/libopensc/pkcs15-oberthur.c | 3 ++-
27 2 files changed, 4 insertions(+), 2 deletions(-)
28
29diff --git a/src/libopensc/card-gids.c b/src/libopensc/card-gids.c
30index fc5d2a7..ac3e579 100644
31--- a/src/libopensc/card-gids.c
32+++ b/src/libopensc/card-gids.c
33@@ -33,6 +33,7 @@ Some features are undocumented like the format used to store certificates. They
34
35 #include <stdlib.h>
36 #include <string.h>
37+#include "../common/compat_strlcpy.h"
38
39 #ifdef ENABLE_OPENSSL
40 /* openssl only needed for card administration */
41@@ -462,7 +463,7 @@ static int gids_create_file(sc_card_t *card, char* directory, char* filename) {
42 memset(masterfilebuffer + offset, 0, sizeof(gids_mf_record_t));
43 record = (gids_mf_record_t*) (masterfilebuffer + offset);
44 strncpy(record->directory, directory, 8);
45- strncpy(record->filename, filename, 8);
46+ strlcpy(record->filename, filename, sizeof(record->filename));
47 record->fileIdentifier = fileIdentifier;
48 record->dataObjectIdentifier = dataObjectIdentifier;
49
50diff --git a/src/libopensc/pkcs15-oberthur.c b/src/libopensc/pkcs15-oberthur.c
51index 4f841ed..3415be7 100644
52--- a/src/libopensc/pkcs15-oberthur.c
53+++ b/src/libopensc/pkcs15-oberthur.c
54@@ -29,6 +29,7 @@
55 #include <stdlib.h>
56 #include <string.h>
57 #include <stdio.h>
58+#include "../common/compat_strlcpy.h"
59
60 #include "pkcs15.h"
61 #include "log.h"
62@@ -738,7 +739,7 @@ sc_pkcs15emu_oberthur_add_prvkey(struct sc_pkcs15_card *p15card,
63 unsigned int id = path.value[path.len - 2] * 0x100 + path.value[path.len - 1];
64
65 if (id == ccont.id_cert) {
66- strncpy(kobj.label, objs[ii]->label, sizeof(kobj.label) - 1);
67+ strlcpy(kobj.label, objs[ii]->label, sizeof(kobj.label));
68 break;
69 }
70 }
71--
722.18.0
73
diff --git a/meta-oe/recipes-support/opensc/opensc_0.16.0.bb b/meta-oe/recipes-support/opensc/opensc_0.18.0.bb
index fd67181dc..c389e0bb5 100644
--- a/meta-oe/recipes-support/opensc/opensc_0.16.0.bb
+++ b/meta-oe/recipes-support/opensc/opensc_0.18.0.bb
@@ -9,10 +9,12 @@ eID cards have also been confirmed to work."
9HOMEPAGE = "http://www.opensc-project.org/opensc/" 9HOMEPAGE = "http://www.opensc-project.org/opensc/"
10SECTION = "System Environment/Libraries" 10SECTION = "System Environment/Libraries"
11 11
12SRC_URI = "${DEBIAN_MIRROR}/main/o/${BPN}/${BPN}_${PV}.orig.tar.gz" 12SRC_URI = "${DEBIAN_MIRROR}/main/o/${BPN}/${BPN}_${PV}.orig.tar.gz \
13 file://0001-Fixed-gcc-8-compilation-errors-1353.patch \
14 "
13 15
14SRC_URI[md5sum] = "724d128f23cd7a74b28d04300ce7bcbd" 16SRC_URI[md5sum] = "bce516f752e0db5327aa06cc0136fe27"
15SRC_URI[sha256sum] = "3ac8c29542bb48179e7086d35a1b8907a4e86aca3de3323c2f48bd74eaaf5729" 17SRC_URI[sha256sum] = "6ef62b00e8fdbe3e386c3ee25c2cadb56c1931ea42f1a11dce8c947f51b45033"
16 18
17DEPENDS = "openct pcsc-lite virtual/libiconv openssl" 19DEPENDS = "openct pcsc-lite virtual/libiconv openssl"
18 20
@@ -21,6 +23,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
21 23
22inherit autotools pkgconfig 24inherit autotools pkgconfig
23 25
26S = "${WORKDIR}/OpenSC-${PV}"
24EXTRA_OECONF = " \ 27EXTRA_OECONF = " \
25 --disable-static \ 28 --disable-static \
26 --enable-openct \ 29 --enable-openct \