* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/files/
@ 2018-09-11 17:25 Alon Bar-Lev
0 siblings, 0 replies; 4+ messages in thread
From: Alon Bar-Lev @ 2018-09-11 17:25 UTC (permalink / raw
To: gentoo-commits
commit: 8b59a66a410b696f8f4face3dd681cf62249cbea
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Sep 11 17:15:51 2018 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Tue Sep 11 17:25:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b59a66a
app-crypt/tpm-tools: remove unused patch(es)
Closes: https://github.com/gentoo/gentoo/pull/9827
app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch b/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
deleted file mode 100644
index 1745c690e57..00000000000
--- a/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index cef6a2f..d7092a7 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -80,4 +80,4 @@ endif
- # Unseal library - for addition to existing apps, counter part of seal cmd
- libtpm_unseal_la_SOURCES = tpm_unseal.c
- libtpm_unseal_la_LDFLAGS = -shared -version-info 1:0:0
--libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la @INTLLIBS@
-+libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la -lcrypto @INTLLIBS@
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/files/
@ 2022-07-12 2:45 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-07-12 2:45 UTC (permalink / raw
To: gentoo-commits
commit: 55e1c6ff631293f6d5167659f58b6a0d8afd6bb3
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Mon Jul 11 00:11:50 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 02:45:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e1c6ff
app-crypt/tpm-tools: Remove libressl support
This removes outdated libressl checks from the openssl-1.1.patch which
are no longer required for the libressl overlay.
Signed-off-by: orbea <orbea <AT> riseup.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch b/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch
index a5747dbca709..ae31af025851 100644
--- a/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch
+++ b/app-crypt/tpm-tools/files/tpm-tools-1.3.9.1-openssl-1.1.patch
@@ -17,7 +17,7 @@ index f534717..33c76e7 100644
#include <openssl/evp.h>
#include <openssl/err.h>
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+static void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) {
+ if ( n )
+ *n = r->n;
@@ -236,6 +236,3 @@ index f534717..33c76e7 100644
rc = 0;
---
-2.19.2
-
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/files/
@ 2016-12-07 21:20 Alon Bar-Lev
0 siblings, 0 replies; 4+ messages in thread
From: Alon Bar-Lev @ 2016-12-07 21:20 UTC (permalink / raw
To: gentoo-commits
commit: 661388c0f554646131627f4276ed5d14bdc6dffa
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 7 19:35:44 2016 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Wed Dec 7 19:37:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=661388c0
Revert "app-crypt/tpm-tools: hopefully better gold support"
This reverts commit c36af760171e28c16a6c386b0fdebe81b68555a4.
.../tpm-tools/files/tpm-tools-1.3.9-gold.patch | 98 +---------------------
1 file changed, 2 insertions(+), 96 deletions(-)
diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch b/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
index 8f999a8..1745c69 100644
--- a/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
+++ b/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
@@ -1,57 +1,5 @@
-From 4cf41d367e3248fecee7620501d12449c374c055 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 6 Dec 2016 09:38:06 +0200
-Subject: [PATCH] build: -lcrypto is required for tspi
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac | 13 +++++++++----
- lib/Makefile.am | 2 +-
- src/cmds/Makefile.am | 2 +-
- src/data_mgmt/Makefile.am | 2 +-
- src/tpm_mgmt/Makefile.am | 2 +-
- 5 files changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 279954a..99f9c4b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -90,14 +90,22 @@ AC_ARG_WITH(openssl,
- AC_MSG_ERROR([$OPENSSL_INCLUDE_DIR or $OPENSSL_LIB_DIR doen't exist!])
- else
- AC_MSG_RESULT([yes])
-- CFLAGS="$CFLAGS -L$OPENSSL_LIB_DIR -I$OPENSSL_INCLUDE_DIR"
-+ CFLAGS="$CFLAGS -I$OPENSSL_INCLUDE_DIR"
-+ LDFLAGS="$LDFLAGS -L$OPENSSL_LIB_DIR"
- AC_SUBST([OPENSSL_LIB_DIR])
- fi],
- [AC_MSG_RESULT([no])
- AC_SUBST([OPENSSL_LIB_DIR], []) ] )
-
-+AC_CHECK_LIB(crypto, PEM_read_X509, [OPENSSL_LIB="1"], [AC_MSG_ERROR([openssl lib not found: libcrypto.so])])
-+AC_CHECK_HEADER(openssl/evp.h, [OPENSSL_INC="1"], [AC_MSG_ERROR([openssl header not found: openssl/evp.h])])
-+
-+OLD_LIBS="$LIBS"
-+LIBS="$LIBS -lcrypto"
- AC_CHECK_LIB(tspi, Tspi_Context_Create, [TSS_LIB="1"], [AC_MSG_ERROR([tss lib not found: libtspi.so])])
- AC_CHECK_LIB(tspi, Tspi_TPM_SetOperatorAuth, [TSS_12="1"], [TSS_12="0"])
-+AC_SUBST([TSPI_LIBS], ["-ltspi -lcrypto"])
-+LIBS="$OLD_LIBS"
- if test "$TSS_12" = "1"; then
- AM_CONDITIONAL(TSS_LIB_IS_12, true)
- AC_MSG_NOTICE([Configuring tpm-tools for TSS 1.2])
-@@ -107,9 +115,6 @@ else
- fi
- AC_CHECK_HEADER(trousers/tss.h, [TSS_INC="1"], [AC_MSG_ERROR([tss header not found: trousers/tss.h])])
-
--AC_CHECK_LIB(crypto, PEM_read_X509, [OPENSSL_LIB="1"], [AC_MSG_ERROR([openssl lib not found: libcrypto.so])])
--AC_CHECK_HEADER(openssl/evp.h, [OPENSSL_INC="1"], [AC_MSG_ERROR([openssl header not found: openssl/evp.h])])
--
- OPENCRYPTOKI="0"
- AC_ARG_ENABLE(pkcs11_support,
- AC_HELP_STRING([--disable-pkcs11-support], [don't build data_mgmt commands [[default=no]]]),
diff --git a/lib/Makefile.am b/lib/Makefile.am
-index c1d7009..af9bc49 100644
+index cef6a2f..d7092a7 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -80,4 +80,4 @@ endif
@@ -59,46 +7,4 @@ index c1d7009..af9bc49 100644
libtpm_unseal_la_SOURCES = tpm_unseal.c
libtpm_unseal_la_LDFLAGS = -shared -version-info 1:0:0
-libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la @INTLLIBS@
-+libtpm_unseal_la_LIBADD = libtpm_tspi.la -lcrypto @TSPI_LIBS@ @INTLLIBS@
-diff --git a/src/cmds/Makefile.am b/src/cmds/Makefile.am
-index 27fc9ef..d7508bf 100644
---- a/src/cmds/Makefile.am
-+++ b/src/cmds/Makefile.am
-@@ -30,7 +30,7 @@ else
- AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX
- endif
-
--LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto @INTLLIBS@
-+LDADD = $(top_builddir)/lib/libtpm_tspi.la $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto @TSPI_LIBS@ @INTLLIBS@
-
- tpm_sealdata_SOURCES = tpm_sealdata.c
- tpm_unsealdata_SOURCES = tpm_unsealdata.c
-diff --git a/src/data_mgmt/Makefile.am b/src/data_mgmt/Makefile.am
-index de505e4..765a2fa 100644
---- a/src/data_mgmt/Makefile.am
-+++ b/src/data_mgmt/Makefile.am
-@@ -38,7 +38,7 @@ noinst_HEADERS = data_common.h \
- # Common build flags
- AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX
-
--LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl @INTLLIBS@
-+LDADD = $(top_builddir)/lib/libtpm_pkcs11.la @TSPI_LIBS@ -ldl @INTLLIBS@
-
-
- #
-diff --git a/src/tpm_mgmt/Makefile.am b/src/tpm_mgmt/Makefile.am
-index 7ca47c9..6205b64 100644
---- a/src/tpm_mgmt/Makefile.am
-+++ b/src/tpm_mgmt/Makefile.am
-@@ -55,7 +55,7 @@ else
- AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX
- endif
-
--LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi @INTLLIBS@
-+LDADD = $(top_builddir)/lib/libtpm_tspi.la @TSPI_LIBS@ @INTLLIBS@
-
- tpm_startup_SOURCES = tpm_startup.c
- tpm_reset_SOURCES = tpm_reset.c
---
-2.7.3
-
++libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la -lcrypto @INTLLIBS@
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/files/
@ 2016-12-06 19:46 Alon Bar-Lev
0 siblings, 0 replies; 4+ messages in thread
From: Alon Bar-Lev @ 2016-12-06 19:46 UTC (permalink / raw
To: gentoo-commits
commit: c36af760171e28c16a6c386b0fdebe81b68555a4
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 6 07:55:34 2016 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 07:55:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c36af760
app-crypt/tpm-tools: hopefully better gold support
Bug: 601776
Package-Manager: portage-2.3.0
.../tpm-tools/files/tpm-tools-1.3.9-gold.patch | 98 +++++++++++++++++++++-
1 file changed, 96 insertions(+), 2 deletions(-)
diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch b/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
index 1745c69..8f999a8 100644
--- a/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
+++ b/app-crypt/tpm-tools/files/tpm-tools-1.3.9-gold.patch
@@ -1,5 +1,57 @@
+From 4cf41d367e3248fecee7620501d12449c374c055 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Tue, 6 Dec 2016 09:38:06 +0200
+Subject: [PATCH] build: -lcrypto is required for tspi
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ configure.ac | 13 +++++++++----
+ lib/Makefile.am | 2 +-
+ src/cmds/Makefile.am | 2 +-
+ src/data_mgmt/Makefile.am | 2 +-
+ src/tpm_mgmt/Makefile.am | 2 +-
+ 5 files changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 279954a..99f9c4b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -90,14 +90,22 @@ AC_ARG_WITH(openssl,
+ AC_MSG_ERROR([$OPENSSL_INCLUDE_DIR or $OPENSSL_LIB_DIR doen't exist!])
+ else
+ AC_MSG_RESULT([yes])
+- CFLAGS="$CFLAGS -L$OPENSSL_LIB_DIR -I$OPENSSL_INCLUDE_DIR"
++ CFLAGS="$CFLAGS -I$OPENSSL_INCLUDE_DIR"
++ LDFLAGS="$LDFLAGS -L$OPENSSL_LIB_DIR"
+ AC_SUBST([OPENSSL_LIB_DIR])
+ fi],
+ [AC_MSG_RESULT([no])
+ AC_SUBST([OPENSSL_LIB_DIR], []) ] )
+
++AC_CHECK_LIB(crypto, PEM_read_X509, [OPENSSL_LIB="1"], [AC_MSG_ERROR([openssl lib not found: libcrypto.so])])
++AC_CHECK_HEADER(openssl/evp.h, [OPENSSL_INC="1"], [AC_MSG_ERROR([openssl header not found: openssl/evp.h])])
++
++OLD_LIBS="$LIBS"
++LIBS="$LIBS -lcrypto"
+ AC_CHECK_LIB(tspi, Tspi_Context_Create, [TSS_LIB="1"], [AC_MSG_ERROR([tss lib not found: libtspi.so])])
+ AC_CHECK_LIB(tspi, Tspi_TPM_SetOperatorAuth, [TSS_12="1"], [TSS_12="0"])
++AC_SUBST([TSPI_LIBS], ["-ltspi -lcrypto"])
++LIBS="$OLD_LIBS"
+ if test "$TSS_12" = "1"; then
+ AM_CONDITIONAL(TSS_LIB_IS_12, true)
+ AC_MSG_NOTICE([Configuring tpm-tools for TSS 1.2])
+@@ -107,9 +115,6 @@ else
+ fi
+ AC_CHECK_HEADER(trousers/tss.h, [TSS_INC="1"], [AC_MSG_ERROR([tss header not found: trousers/tss.h])])
+
+-AC_CHECK_LIB(crypto, PEM_read_X509, [OPENSSL_LIB="1"], [AC_MSG_ERROR([openssl lib not found: libcrypto.so])])
+-AC_CHECK_HEADER(openssl/evp.h, [OPENSSL_INC="1"], [AC_MSG_ERROR([openssl header not found: openssl/evp.h])])
+-
+ OPENCRYPTOKI="0"
+ AC_ARG_ENABLE(pkcs11_support,
+ AC_HELP_STRING([--disable-pkcs11-support], [don't build data_mgmt commands [[default=no]]]),
diff --git a/lib/Makefile.am b/lib/Makefile.am
-index cef6a2f..d7092a7 100644
+index c1d7009..af9bc49 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -80,4 +80,4 @@ endif
@@ -7,4 +59,46 @@ index cef6a2f..d7092a7 100644
libtpm_unseal_la_SOURCES = tpm_unseal.c
libtpm_unseal_la_LDFLAGS = -shared -version-info 1:0:0
-libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la @INTLLIBS@
-+libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la -lcrypto @INTLLIBS@
++libtpm_unseal_la_LIBADD = libtpm_tspi.la -lcrypto @TSPI_LIBS@ @INTLLIBS@
+diff --git a/src/cmds/Makefile.am b/src/cmds/Makefile.am
+index 27fc9ef..d7508bf 100644
+--- a/src/cmds/Makefile.am
++++ b/src/cmds/Makefile.am
+@@ -30,7 +30,7 @@ else
+ AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX
+ endif
+
+-LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto @INTLLIBS@
++LDADD = $(top_builddir)/lib/libtpm_tspi.la $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto @TSPI_LIBS@ @INTLLIBS@
+
+ tpm_sealdata_SOURCES = tpm_sealdata.c
+ tpm_unsealdata_SOURCES = tpm_unsealdata.c
+diff --git a/src/data_mgmt/Makefile.am b/src/data_mgmt/Makefile.am
+index de505e4..765a2fa 100644
+--- a/src/data_mgmt/Makefile.am
++++ b/src/data_mgmt/Makefile.am
+@@ -38,7 +38,7 @@ noinst_HEADERS = data_common.h \
+ # Common build flags
+ AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX
+
+-LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl @INTLLIBS@
++LDADD = $(top_builddir)/lib/libtpm_pkcs11.la @TSPI_LIBS@ -ldl @INTLLIBS@
+
+
+ #
+diff --git a/src/tpm_mgmt/Makefile.am b/src/tpm_mgmt/Makefile.am
+index 7ca47c9..6205b64 100644
+--- a/src/tpm_mgmt/Makefile.am
++++ b/src/tpm_mgmt/Makefile.am
+@@ -55,7 +55,7 @@ else
+ AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX
+ endif
+
+-LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi @INTLLIBS@
++LDADD = $(top_builddir)/lib/libtpm_tspi.la @TSPI_LIBS@ @INTLLIBS@
+
+ tpm_startup_SOURCES = tpm_startup.c
+ tpm_reset_SOURCES = tpm_reset.c
+--
+2.7.3
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-07-12 2:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-11 17:25 [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm-tools/files/ Alon Bar-Lev
-- strict thread matches above, loose matches on Subject: below --
2022-07-12 2:45 Sam James
2016-12-07 21:20 Alon Bar-Lev
2016-12-06 19:46 Alon Bar-Lev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox