tpm: bump tpm2-tss-engine: 1.2.0; tpm2-tools: 5.6; fix openssl-1.1

2 files changed, 50 insertions, 41 deletions

diff --git a/px/packages/device.scm b/px/packages/device.scm
index 1d11564..ba812eb 100644
--- a/px/packages/device.scm
+++ b/px/packages/device.scm
@@ -87,9 +87,9 @@
                                "/lib/libtss2-tcti-device.so:/dev/tpm0"))))
                         #t)))
                   (delete 'sanity-check))))
-    (inputs `(("openssl" ,openssl)
-              ("python-idna" ,python-idna)
+    (inputs `(("openssl" ,openssl-1.1)
               ("python-requests" ,python-requests)
+              ("python-idna" ,python-idna)
               ("python-authlib-0.14.3" ,python-authlib-0.14.3)
               ("python-pycryptodomex" ,python-pycryptodomex)
               ("python-jose" ,python-jose)
@@ -156,13 +156,11 @@
                         #t)))
                   (delete 'sanity-check))))
     (inputs `(("python-waitress" ,python-waitress)
-              ("openssl" ,openssl)
-              ("python-idna" ,python-idna)
+              ("openssl" ,openssl-1.1)
               ("python-requests" ,python-requests)
               ("python-flask" ,python-flask)
               ("python-werkzeug" ,python-werkzeug)
               ("python-authlib-0.14.3" ,python-authlib-0.14.3)
-              ("python-exitstatus-2.0.1" ,python-exitstatus-2.0.1)
               ("python-pycryptodomex" ,python-pycryptodomex)
               ("python-jose" ,python-jose)
               ("python-pyyaml" ,python-pyyaml)
@@ -219,14 +217,12 @@
                             (,(string-append tpm2-tss
                                "/lib/libtss2-tcti-device.so:/dev/tpm0")))) #t)))
                   (delete 'sanity-check))))
-    (inputs `(("openssl" ,openssl)
-              ("python-idna" ,python-idna)
+    (inputs `(("openssl" ,openssl-1.1)
               ("python-requests" ,python-requests)
               ("python-authlib-0.14.3" ,python-authlib-0.14.3)
-              ("python-exitstatus-2.0.1" ,python-exitstatus-2.0.1)
               ("python-pycryptodomex" ,python-pycryptodomex)
               ("python-jose" ,python-jose)
-              ("python-pyyaml-v5.3.1" ,python-pyyaml-v5.3.1)
+              ("python-pyyaml" ,python-pyyaml)
               ("python-shortuuid" ,python-shortuuid-v1)
               ("python-appdirs" ,python-appdirs)
               ("python-psutil" ,python-psutil)
@@ -281,16 +277,14 @@
                                "/lib/libtss2-tcti-device.so:/dev/tpm0")))) #t)))
                   (delete 'sanity-check))))
     (inputs `(("python-waitress" ,python-waitress)
-              ("openssl" ,openssl)
-              ("python-idna" ,python-idna)
+              ("openssl" ,openssl-1.1)
               ("python-requests" ,python-requests)
               ("python-flask" ,python-flask)
               ("python-werkzeug" ,python-werkzeug)
               ("python-authlib-0.14.3" ,python-authlib-0.14.3)
-              ("python-exitstatus-2.0.1" ,python-exitstatus-2.0.1)
               ("python-pycryptodomex" ,python-pycryptodomex)
               ("python-jose" ,python-jose)
-              ("python-pyyaml-v5.3.1" ,python-pyyaml-v5.3.1)
+              ("python-pyyaml" ,python-pyyaml)
               ("python-shortuuid" ,python-shortuuid-v1)
               ("python-appdirs" ,python-appdirs)
               ("python-psutil" ,python-psutil)
@@ -360,7 +354,7 @@
                           `("TPM2TOOLS_TCTI" ":" prefix
                             (,(string-append tpm2-tss
                                "/lib/libtss2-tcti-device.so:/dev/tpm0")))) #t))))))
-    (inputs `(("openssl" ,openssl)
+    (inputs `(("openssl" ,openssl-1.1)
               ("tpm2-tss" ,tpm2-tss-openssl-1.1)
               ("tpm2-tss-engine" ,tpm2-tss-engine)
               ("bash-minimal" ,bash-minimal)))
@@ -412,14 +406,12 @@ configuration file from commandline args and upload results to the server")
                                "/lib/libtss2-tcti-device.so:/dev/tpm0")))) #t)))
                   (delete 'sanity-check))))
     (inputs `(("python-waitress" ,python-waitress)
-              ("openssl" ,openssl)
-              ("python-idna" ,python-idna)
+              ("openssl" ,openssl-1.1)
               ("python-requests" ,python-requests)
               ("python-authlib-0.14.3" ,python-authlib-0.14.3)
-              ("python-exitstatus-2.0.1" ,python-exitstatus-2.0.1)
               ("python-pycryptodomex" ,python-pycryptodomex)
               ("python-jose" ,python-jose)
-              ("python-pyyaml-v5.3.1" ,python-pyyaml-v5.3.1)
+              ("python-pyyaml" ,python-pyyaml)
               ("python-shortuuid" ,python-shortuuid-v1)
               ("python-appdirs" ,python-appdirs)
               ("python-psutil" ,python-psutil)
diff --git a/px/packages/tpm.scm b/px/packages/tpm.scm
index 4c12cbf..8687344 100644
--- a/px/packages/tpm.scm
+++ b/px/packages/tpm.scm
@@ -79,15 +79,20 @@ and libtss2-tcti-mssim.")
 (define-public tpm2-tss-engine
   (package
     (name "tpm2-tss-engine")
-    (version "1.1.0")
+    (version "1.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append
-             "https://github.com/tpm2-software/tpm2-tss-engine/archive/v"
+             "https://github.com/tpm2-software/tpm2-tss-engine/archive/refs/tags/"
              version ".tar.gz"))
        (sha256
-        (base32 "0xby0jhdpp9jlwd84dp97y7fx7swww1b1k5srr9k64akbnrgwpz0"))))
+        (base32 "1cjfj0gl6d9kmc18h54kfs065lx3qyfjm8cj9hzjmkwin6m726rb"))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (substitute* "bootstrap"
+                     (("git describe --tags --always --dirty > VERSION")
+                      "echo" version "> VERSION"))))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ;only manual test scripts
@@ -140,24 +145,32 @@ and libtss2-tcti-mssim.")
     (inputs `(("tpm2-tss" ,tpm2-tss-openssl-1.1)
               ("bash-minimal" ,bash-minimal)))
     (home-page "https://github.com/tpm2-software/tpm2-tss-engine")
-    (synopsis
-     "The tpm2-tss-engine project implements a cryptographic engine for OpenSSL for Trusted Platform Module (TPM 2.0) using the tpm2-tss software stack that follows the Trusted Computing Groups (TCG) TPM Software Stack (TSS 2.0).")
+    (synopsis "OpenSSL Engine for TPM2 devices")
     (description
-     "The tpm2-tss-engine project implements a cryptographic engine for OpenSSL for Trusted Platform Module (TPM 2.0) using the tpm2-tss software stack that follows the Trusted Computing Groups (TCG) TPM Software Stack (TSS 2.0).")
+     "The tpm2-tss-engine project implements a cryptographic engine for OpenSSL
+for Trusted Platform Module (TPM 2.0) using the tpm2-tss software stack that
+follows the Trusted Computing Groups (TCG) TPM Software Stack (TSS 2.0).")
     (license license:bsd-2)))
 
 (define-public tpm2-tools
   (package
     (name "tpm2-tools")
-    (version "4.3.1")
+    (version "5.6")
     (source
      (origin
        (method url-fetch)
+       ;; 1qpqpjcps25as7sif7pa0yqz17562gp6d38v14hcxcxgnp3zlsbi
        (uri (string-append
-             "https://github.com/tpm2-software/tpm2-tools/archive/" version
-             ".tar.gz"))
+             "https://github.com/tpm2-software/tpm2-tools/archive/refs/tags/"
+             version ".tar.gz"))
        (sha256
-        (base32 "1sfrgzwhpbilk29lh233k0wncd0b5v12w2bz4h8n7nclcdlhw449"))))
+        (base32 "1qpqpjcps25as7sif7pa0yqz17562gp6d38v14hcxcxgnp3zlsbi"))
+
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (substitute* "bootstrap"
+                     (("git describe --tags --always --dirty > VERSION")
+                      "echo" version " > VERSION"))))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ;only manual test scripts
@@ -177,10 +190,8 @@ and libtss2-tcti-mssim.")
                      ("libuuid" ,util-linux "lib")
                      ("tpm2-tss" ,tpm2-tss-openssl-1.1)))
     (home-page "https://github.com/tpm2-software/tpm2-tools")
-    (synopsis
-     "The source repository for the Trusted Platform Module (TPM2.0) tools ")
-    (description
-     "The source repository for the Trusted Platform Module (TPM2.0) tools ")
+    (synopsis "Trusted Platform Module (TPM2.0) tools")
+    (description "TPM (Trusted Platform Module) 2.0 tools based on tpm2-tss")
     (license license:lgpl2.1+)))
 
 (define-public tpm2-abrmd
@@ -204,15 +215,15 @@ and libtss2-tcti-mssim.")
                      ("git" ,git)
                      ("libtool" ,libtool)
                      ("pkg-config" ,pkg-config)
-                     ("tpm2-tss" ,tpm2-tss)
+                     ("tpm2-tss" ,tpm2-tss-openssl-1.1)
                      ("which" ,which)))
     (home-page "https://github.com/tpm2-software/tpm2-abrmd")
     (synopsis "TPM2 Access Broker & Resource Manager")
     (description
      "This is a system daemon implementing the TPM2 access broker (TAB) 
-     & Resource Manager (RM) spec from the TCG. The daemon (tpm2-abrmd) is 
-     implemented using Glib and the GObject system. In this documentation and in the code 
-     we use tpm2-abrmd and tabrmd interchangeably.")
+& Resource Manager (RM) spec from the TCG. The daemon (tpm2-abrmd) is 
+implemented using Glib and the GObject system. In this documentation and in the code 
+we use tpm2-abrmd and tabrmd interchangeably.")
     (license license:bsd-2)))
 
 (define-public tpm2-pkcs11
@@ -226,7 +237,13 @@ and libtss2-tcti-mssim.")
              "https://github.com/tpm2-software/tpm2-pkcs11/archive/refs/tags/"
              version ".tar.gz"))
        (sha256
-        (base32 "0kkzzdxiz1389jl4rabh739m99x1jh42xagq4sycn5s8kvik1sa5"))))
+        (base32 "0kkzzdxiz1389jl4rabh739m99x1jh42xagq4sycn5s8kvik1sa5"))
+
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (substitute* "bootstrap"
+                     (("git describe --tags --always --dirty > VERSION")
+                      "echo" version " > VERSION"))))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ;only manual test scripts
@@ -240,14 +257,14 @@ and libtss2-tcti-mssim.")
                      ("pkg-config" ,pkg-config)))
     (inputs `(("libyaml" ,libyaml)
               ("sqlite" ,sqlite)
-              ("openssl" ,openssl)
+              ("openssl" ,openssl-1.1)
               ("tpm2-abrmd" ,tpm2-abrmd)
               ("tpm2-tools" ,tpm2-tools)
-              ("tpm2-tss" ,tpm2-tss)))
+              ("tpm2-tss" ,tpm2-tss-openssl-1.1)))
     (home-page "https://github.com/tpm2-software/tpm2-pkcs11")
     (synopsis "A PKCS#11 interface for TPM2 hardware")
     (description
      "PKCS #11 is a Public-Key Cryptography Standard that defines a standard method 
-     to access cryptographic services from tokens/ devices such as hardware security modules (HSM), 
-     smart cards, etc. In this project we intend to use a TPM2 device as the cryptographic token.")
+to access cryptographic services from tokens/ devices such as hardware security modules (HSM), 
+smart cards, etc. In this project we intend to use a TPM2 device as the cryptographic token.")
     (license license:bsd-2)))