[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-emulator/, app-crypt/tpm-emulator/files/
commit: 96278bd867bd974b6200863215ec5aec3d31503a
Author: Alon Bar-Lev gentoo org>
AuthorDate: Sun Sep 16 10:35:46 2018 +
Commit: Alon Bar-Lev gentoo org>
CommitDate: Sun Sep 16 10:38:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96278bd8
app-crypt/tpm-emulator: fix strncpy build
Closes: https://bugs.gentoo.org/show_bug.cgi?id=666326
Thanks: Toralf Förster
.../files/tpm-emulator-0.7.5-build.patch | 33 ++
app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild | 4 +++
2 files changed, 37 insertions(+)
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-build.patch
b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-build.patch
new file mode 100644
index 000..3f96bdd3e68
--- /dev/null
+++ b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.5-build.patch
@@ -0,0 +1,33 @@
+From 78f018a79243b8aa3c2a8e8aa87245c58c731278 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev
+Date: Sun, 16 Sep 2018 13:29:59 +0300
+Subject: [PATCH] tpmd_dev: fix strncpy bound
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+tpmd_dev/linux/tpmd_dev.c:88:3: error: ‘strncpy’ specified bound 108 equals
destination size [-Werror=stringop-truncation]
+
+Bug: https://github.com/PeterHuewe/tpm-emulator/pull/43
+
+Signed-off-by: Alon Bar-Lev
+---
+ tpmd_dev/linux/tpmd_dev.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tpmd_dev/linux/tpmd_dev.c b/tpmd_dev/linux/tpmd_dev.c
+index 2b24bd7..72583f4 100644
+--- a/tpmd_dev/linux/tpmd_dev.c
b/tpmd_dev/linux/tpmd_dev.c
+@@ -85,7 +85,7 @@ static int tpmd_connect(char *socket_name)
+ return res;
+ }
+ addr.sun_family = AF_UNIX;
+- strncpy(addr.sun_path, socket_name, sizeof(addr.sun_path));
++ strncpy(addr.sun_path, socket_name, sizeof(addr.sun_path)-1);
+ res = tpmd_sock->ops->connect(tpmd_sock,
+ (struct sockaddr*), sizeof(struct sockaddr_un), 0);
+ if (res != 0) {
+--
+2.16.4
+
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild
b/app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild
index 70301caebee..97b70a4785f 100644
--- a/app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild
@@ -22,6 +22,10 @@ RDEPEND="ssl? (
DEPEND="${RDEPEND}
!ssl? ( dev-libs/gmp )"
+PATCHES=(
+ "${FILESDIR}/${P}-build.patch"
+)
+
pkg_setup() {
enewgroup tss
enewuser tss -1 -1 /var/lib/tpm tss
[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-emulator/, app-crypt/tpm-emulator/files/
commit: 098588af315d901e7d6ff530fb17efad6acc1904
Author: Alon Bar-Lev gentoo org>
AuthorDate: Sat Sep 15 22:20:28 2018 +
Commit: Alon Bar-Lev gentoo org>
CommitDate: Sat Sep 15 22:21:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=098588af
app-crypt/tpm-emulator: drop -r2 from conf.d/init.d
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../tpm-emulator/files/{tpm-emulator.confd-r2 => tpm-emulator.confd} | 0
.../tpm-emulator/files/{tpm-emulator.initd-r2 => tpm-emulator.initd} | 0
app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator.confd-r2
b/app-crypt/tpm-emulator/files/tpm-emulator.confd
similarity index 100%
rename from app-crypt/tpm-emulator/files/tpm-emulator.confd-r2
rename to app-crypt/tpm-emulator/files/tpm-emulator.confd
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator.initd-r2
b/app-crypt/tpm-emulator/files/tpm-emulator.initd
similarity index 100%
rename from app-crypt/tpm-emulator/files/tpm-emulator.initd-r2
rename to app-crypt/tpm-emulator/files/tpm-emulator.initd
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild
b/app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild
index 38f20de07c7..70301caebee 100644
--- a/app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild
@@ -57,8 +57,8 @@ src_install() {
udev_newrules "tpmd_dev/linux/tpmd_dev.rules" 60-tpmd_dev.rules
fi
- newinitd "${FILESDIR}/${PN}.initd-r2" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd-r2" "${PN}"
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
keepdir /var/log/tpm
fowners tss:tss /var/log/tpm
[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-emulator/, app-crypt/tpm-emulator/files/
commit: ed3f7accadd7fbd5c529ea68793fad723eccc31f
Author: Alon Bar-Lev gentoo org>
AuthorDate: Sat Sep 15 22:16:20 2018 +
Commit: Alon Bar-Lev gentoo org>
CommitDate: Sat Sep 15 22:21:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed3f7acc
app-crypt/tpm-emulator: version bump
Closes: https://bugs.gentoo.org/show_bug.cgi?id=537544
Closes: https://bugs.gentoo.org/show_bug.cgi?id=540384
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-crypt/tpm-emulator/Manifest| 1 +
.../files/tpm-emulator-0.7.4-cmake.patch | 120 -
...r-0.7.4-r2.ebuild => tpm-emulator-0.7.5.ebuild} | 13 +--
3 files changed, 4 insertions(+), 130 deletions(-)
diff --git a/app-crypt/tpm-emulator/Manifest b/app-crypt/tpm-emulator/Manifest
index 555e9753a5a..ee01c035b31 100644
--- a/app-crypt/tpm-emulator/Manifest
+++ b/app-crypt/tpm-emulator/Manifest
@@ -1 +1,2 @@
+DIST tpm-emulator-0.7.5.tar.gz 222341 BLAKE2B
c6dc7494800f4c6d1f5e622c6a47fdd5487e0f2cbc34173d9039d6eb5fd7541dd2c1f514efbf220c605424059844e18650b31ee9934eda6626427b915fd6bc53
SHA512
24c16ec36ca92c484d6e8dfa53c8ca00dbc5b58d78d7166041db1e9ae277d763f0fc0a6b0cbd7e62fcf4671f6ad2d8df1213256be0a4200b79b6ee61ab73b2ef
DIST tpm_emulator-0.7.4.tar.gz 214145 BLAKE2B
b8bbd53ecfb90e87f1306c03d2c65a472819d23d10bd63fa966bfadef4776c3876c2f6fc03cc878ece670bdfcd22c9f403ef4bc7f4593a0a6c7f8d17051ac3ba
SHA512
4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-cmake.patch
b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-cmake.patch
deleted file mode 100644
index 7fd775139b2..000
--- a/app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-cmake.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-
-Pull request:
-https://github.com/PeterHuewe/tpm-emulator/pull/37
-
-
-From 694b7c24ac09e0ec1e54ab71eb9c82a8d4f41d33 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev
-Date: Tue, 11 Sep 2018 14:08:49 +0300
-Subject: [PATCH 1/3] build: use GNUInstallDirs to allow override install
- directories
-
-Signed-off-by: Alon Bar-Lev
- CMakeLists.txt | 1 +
- tddl/CMakeLists.txt | 6 +++---
- tpmd/unix/CMakeLists.txt | 2 +-
- 3 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f362298..d047ce3 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,6 +6,7 @@
- project(TPM_Emulator C)
-
- cmake_minimum_required(VERSION 2.4)
-+include(GNUInstallDirs)
- set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
- if(COMMAND cmake_policy)
- cmake_policy(SET CMP0003 NEW)
-diff --git a/tddl/CMakeLists.txt b/tddl/CMakeLists.txt
-index 0be3281..6cc63b3 100644
a/tddl/CMakeLists.txt
-+++ b/tddl/CMakeLists.txt
-@@ -15,9 +15,9 @@ elseif(WIN32)
- set_target_properties(tddl PROPERTIES PREFIX "")
- endif()
-
--install(TARGETS tddl DESTINATION lib)
--install(TARGETS tddl_static DESTINATION lib)
--install(FILES "tddl.h" DESTINATION include)
-+install(TARGETS tddl DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(TARGETS tddl_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(FILES "tddl.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
- include_directories(${CMAKE_CURRENT_SOURCE_DIR})
- add_executable(test_tddl test_tddl.c)
-diff --git a/tpmd/unix/CMakeLists.txt b/tpmd/unix/CMakeLists.txt
-index 40c436b..c5c394a 100644
a/tpmd/unix/CMakeLists.txt
-+++ b/tpmd/unix/CMakeLists.txt
-@@ -13,5 +13,5 @@ target_link_libraries(tpmd mtm tpm tpm_crypto)
- else()
- target_link_libraries(tpmd tpm tpm_crypto)
- endif()
--install(TARGETS tpmd RUNTIME DESTINATION bin)
-+install(TARGETS tpmd RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-
---
-2.16.4
-
-From 89bf733368dda265040cf44ff8be69a15ab66712 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev
-Date: Tue, 11 Sep 2018 16:36:12 +0300
-Subject: [PATCH 2/3] build: do not build mtm unless enabled
-
-Signed-off-by: Alon Bar-Lev
- CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d047ce3..b8b68a3 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -67,7 +67,9 @@ include_directories(${CMAKE_BINARY_DIR})
-
- # add internal libraries
- add_subdirectory(tpm)
--add_subdirectory(mtm)
-+if(MTM_EMULATOR)
-+add_subdirectory(mtm)
-+endif()
- add_subdirectory(crypto)
-
- # add TDDL
---
-2.16.4
-
-From 24bbf683de0b0b24f0ec81d093c03e1f6a9570f2 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev
-Date: Tue, 11 Sep 2018 14:20:19 +0300
-Subject: [PATCH 3/3] build: support BUILD_DEV to disable device build
-
-Signed-off-by: Alon Bar-Lev
- CMakeLists.txt | 7 ++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b8b68a3..9ae6562 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,7 +76,12 @@ add_subdirectory(crypto)
- add_subdirectory(tddl)
-
- # add kernel modules
[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-emulator/, app-crypt/tpm-emulator/files/
commit: 885121cfa0e1704416f3a6490b47a372bb7f2dd0
Author: Alon Bar-Lev gentoo org>
AuthorDate: Sat Sep 15 22:18:02 2018 +
Commit: Alon Bar-Lev gentoo org>
CommitDate: Sat Sep 15 22:21:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=885121cf
app-crypt/tpm-emulator: cleanup old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-crypt/tpm-emulator/Manifest| 1 -
.../files/tpm-emulator-0.7.4-build.patch | 100 -
.../tpm-emulator/files/tpm-emulator.confd-0.7.4| 2 -
.../tpm-emulator/files/tpm-emulator.initd-0.7.4| 59
.../tpm-emulator/tpm-emulator-0.7.4-r1.ebuild | 80 -
5 files changed, 242 deletions(-)
diff --git a/app-crypt/tpm-emulator/Manifest b/app-crypt/tpm-emulator/Manifest
index ee01c035b31..69569405245 100644
--- a/app-crypt/tpm-emulator/Manifest
+++ b/app-crypt/tpm-emulator/Manifest
@@ -1,2 +1 @@
DIST tpm-emulator-0.7.5.tar.gz 222341 BLAKE2B
c6dc7494800f4c6d1f5e622c6a47fdd5487e0f2cbc34173d9039d6eb5fd7541dd2c1f514efbf220c605424059844e18650b31ee9934eda6626427b915fd6bc53
SHA512
24c16ec36ca92c484d6e8dfa53c8ca00dbc5b58d78d7166041db1e9ae277d763f0fc0a6b0cbd7e62fcf4671f6ad2d8df1213256be0a4200b79b6ee61ab73b2ef
-DIST tpm_emulator-0.7.4.tar.gz 214145 BLAKE2B
b8bbd53ecfb90e87f1306c03d2c65a472819d23d10bd63fa966bfadef4776c3876c2f6fc03cc878ece670bdfcd22c9f403ef4bc7f4593a0a6c7f8d17051ac3ba
SHA512
4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-build.patch
b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-build.patch
deleted file mode 100644
index ada748f7129..000
--- a/app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-build.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From ca99fe81c8aee204c1a8b7f3ca264130e54d9418 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev
-Date: Sat, 1 Sep 2018 21:32:07 +0300
-Subject: [PATCH] tpm: tpm_deprecated.c fix compare
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-tpm/tpm_deprecated.c:437:7: error: ‘__builtin_memcmp_eq’ reading 20 bytes from
a region of size 8 [-Werror=stringop-overflow=]
- if (memcmp(, , sizeof(TPM_HMAC))) {
- ^~~
-cc1: all warnings being treated as errors
-
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=664198
- tpm/tpm_deprecated.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tpm/tpm_deprecated.c b/tpm/tpm_deprecated.c
-index c362b56..4c49f54 100644
a/tpm/tpm_deprecated.c
-+++ b/tpm/tpm_deprecated.c
-@@ -434,7 +434,7 @@ TPM_RESULT TPM_ChangeAuthAsymFinish(TPM_KEY_HANDLE
parentHandle,
- tpm_hmac_final(_ctx, b1.digest);
- /* 6. The TPM SHALL compare b1 with newAuthLink. The TPM SHALL
- indicate a failure if the values do not match. */
-- if (memcmp(, , sizeof(TPM_HMAC))) {
-+ if (memcmp(, newAuthLink, sizeof(TPM_HMAC))) {
- debug("TPM_ChangeAuthAsymFinish(): newAuthLink value does not match.");
- return TPM_FAIL;
- }
-From 035af1df2b18afd695150c6f9e426133b775c0a1 Mon Sep 17 00:00:00 2001
-From: Florian Larysch
-Date: Tue, 24 Oct 2017 19:33:00 +0200
-Subject: [PATCH] tpm_command_handler: fix switch fallthrough
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Compiling with a recent GCC fails as follows:
-
- tpm-emulator/tpm/tpm_cmd_handler.c: In function ‘tpm_setup_rsp_auth’:
- tpm-emulator/tpm/tpm_cmd_handler.c:3332:7: error: this statement may fall
through [-Werror=implicit-fallthrough=]
- tpm_hmac_final(, rsp->auth2->auth);
- ^~~
- tpm-emulator/tpm/tpm_cmd_handler.c::5: note: here
- case TPM_TAG_RSP_AUTH1_COMMAND:
-
-Looking at the code, this does indeed seem unintentional. Add a break
-state in the appropriate place.
- tpm/tpm_cmd_handler.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tpm/tpm_cmd_handler.c b/tpm/tpm_cmd_handler.c
-index 288d1ce..5aea4e7 100644
a/tpm/tpm_cmd_handler.c
-+++ b/tpm/tpm_cmd_handler.c
-@@ -3330,6 +3330,7 @@ static void tpm_setup_rsp_auth(TPM_COMMAND_CODE ordinal,
TPM_RESPONSE *rsp)
- sizeof(rsp->auth2->nonceOdd.nonce));
- tpm_hmac_update(, (BYTE*)>auth2->continueAuthSession, 1);
- tpm_hmac_final(, rsp->auth2->auth);
-+ break;
- case TPM_TAG_RSP_AUTH1_COMMAND:
- tpm_hmac_init(, rsp->auth1->secret, sizeof(rsp->auth1->secret));
- tpm_hmac_update(, rsp->auth1->digest, sizeof(rsp->auth1->digest));
---
-2.16.4
-
-From 0f4579e913aeb3a893631a3caee420a0e9803683 Mon Sep 17 00:00:00 2001
-From: Peter Huewe
-Date: Mon, 26 Jun 2017 00:25:43 +0200
-Subject: [PATCH] Workaround wrong fallthrough case by returning TPM_FAIL
-
-The spec says that the number of verified PCRs should be returned - which it
currently does
[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-emulator/, app-crypt/tpm-emulator/files/
commit: b220ce5e246cfee6691af027c86045a9d1fffe21
Author: Alon Bar-Lev gentoo org>
AuthorDate: Sun Sep 9 08:14:32 2018 +
Commit: Alon Bar-Lev gentoo org>
CommitDate: Sun Sep 9 08:15:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b220ce5e
app-crypt/tpm-emulator: fix incorrect memcpy
Closes: https://bugs.gentoo.org/show_bug.cgi?id=664198
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../files/tpm-emulator-0.7.4-build.patch | 31 ++
.../tpm-emulator/tpm-emulator-0.7.4-r1.ebuild | 4 +++
2 files changed, 35 insertions(+)
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-build.patch
b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-build.patch
new file mode 100644
index 000..7a299a15fbf
--- /dev/null
+++ b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-build.patch
@@ -0,0 +1,31 @@
+From ca99fe81c8aee204c1a8b7f3ca264130e54d9418 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev
+Date: Sat, 1 Sep 2018 21:32:07 +0300
+Subject: [PATCH] tpm: tpm_deprecated.c fix compare
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+tpm/tpm_deprecated.c:437:7: error: ‘__builtin_memcmp_eq’ reading 20 bytes from
a region of size 8 [-Werror=stringop-overflow=]
+ if (memcmp(, , sizeof(TPM_HMAC))) {
+ ^~~
+cc1: all warnings being treated as errors
+
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=664198
+---
+ tpm/tpm_deprecated.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tpm/tpm_deprecated.c b/tpm/tpm_deprecated.c
+index c362b56..4c49f54 100644
+--- a/tpm/tpm_deprecated.c
b/tpm/tpm_deprecated.c
+@@ -434,7 +434,7 @@ TPM_RESULT TPM_ChangeAuthAsymFinish(TPM_KEY_HANDLE
parentHandle,
+ tpm_hmac_final(_ctx, b1.digest);
+ /* 6. The TPM SHALL compare b1 with newAuthLink. The TPM SHALL
+ indicate a failure if the values do not match. */
+- if (memcmp(, , sizeof(TPM_HMAC))) {
++ if (memcmp(, newAuthLink, sizeof(TPM_HMAC))) {
+ debug("TPM_ChangeAuthAsymFinish(): newAuthLink value does not match.");
+ return TPM_FAIL;
+ }
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
b/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
index 0192de92e2f..6fc770390fc 100644
--- a/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
@@ -24,6 +24,10 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${P/-/_}
+PATCHES=(
+ "${FILESDIR}/${P}-build.patch"
+)
+
pkg_setup() {
enewgroup tss
enewuser tss -1 -1 /var/lib/tpm tss
