From efb1433cc7ea7cae3ac60464a4c9164f6deeb26c Mon Sep 17 00:00:00 2001
From: Anton Gerasimov <anton@advancedtelematic.com>
Date: Fri, 10 Nov 2017 16:01:52 +0100
Subject: Add UPTANE key generation capability

---
 recipes-sota/aktualizr/aktualizr_git.bb         | 3 +--
 recipes-sota/aktualizr/files/sota_hsm_test.toml | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 470c9bf..c98027d 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -19,7 +19,7 @@ PR = "7"
 SRC_URI = " \
   git://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \
   "
-SRCREV = "67c4f44c4136d16871726449502e3926098e8524"
+SRCREV = "f043191ae622a96cf2f4d48f9073d5cfa9f16e3f"
 BRANCH ?= "master"
 
 S = "${WORKDIR}/git"
@@ -34,7 +34,6 @@ EXTRA_OECMAKE_append_class-native = "-DBUILD_SOTA_TOOLS=ON -DBUILD_OSTREE=OFF "
 
 do_install_append () {
     rm -f ${D}${bindir}/aktualizr_cert_provider
-    rm -f ${D}${bindir}/garage-deploy
 }
 do_install_append_class-target () {
     rm -f ${D}${bindir}/aktualizr_implicit_writer
diff --git a/recipes-sota/aktualizr/files/sota_hsm_test.toml b/recipes-sota/aktualizr/files/sota_hsm_test.toml
index 1317914..28aefc2 100644
--- a/recipes-sota/aktualizr/files/sota_hsm_test.toml
+++ b/recipes-sota/aktualizr/files/sota_hsm_test.toml
@@ -12,6 +12,7 @@ pass = "1234"
 
 [uptane]
 metadata_path = "/var/sota/metadata"
-private_key_path = "ecukey.der"
-public_key_path = "ecukey.pub"
+key_source = "pkcs11"
+private_key_path = "03"
+public_key_path = "03"
 
-- 
cgit v1.2.3-54-g00ecf


From 9e0bd0dfb5bba1ec0806cc3c31859a95c3460b4b Mon Sep 17 00:00:00 2001
From: Anton Gerasimov <anton@advancedtelematic.com>
Date: Fri, 10 Nov 2017 16:25:55 +0100
Subject: Add the newest version of libp11

---
 recipes-support/libp11/libp11_0.4.7.bb | 37 ++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 recipes-support/libp11/libp11_0.4.7.bb

diff --git a/recipes-support/libp11/libp11_0.4.7.bb b/recipes-support/libp11/libp11_0.4.7.bb
new file mode 100644
index 0000000..7d77e90
--- /dev/null
+++ b/recipes-support/libp11/libp11_0.4.7.bb
@@ -0,0 +1,37 @@
+SUMMARY = "Library for using PKCS"
+DESCRIPTION = "\
+Libp11 is a library implementing a small layer on top of PKCS \
+make using PKCS"
+HOMEPAGE = "http://www.opensc-project.org/libp11"
+SECTION = "Development/Libraries"
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29"
+DEPENDS = "libtool openssl"
+
+SRC_URI = "git://github.com/OpenSC/libp11.git"
+SRCREV = "da725ab727342083478150a203a3c80c4551feb4"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+# Currently, Makefile dependencies are incorrectly defined which causes build errors
+# The number of jobs is high
+# See https://github.com/OpenSC/libp11/issues/94
+PARALLEL_MAKE = ""
+EXTRA_OECONF = "--disable-static"
+
+do_install_append () {
+    rm -rf ${D}${libdir}/*.la
+    rm -rf ${D}${docdir}/${BPN}
+}
+
+FILES_${PN} = "${libdir}/engines/pkcs11.so \
+               ${libdir}/engines/libpkcs11${SOLIBS} \
+               ${libdir}/libp11${SOLIBS}"
+
+FILES_${PN}-dev = " \
+                   ${libdir}/engines/libpkcs11${SOLIBSDEV} \
+                   ${libdir}/libp11${SOLIBSDEV} \
+                   ${libdir}/pkgconfig/libp11.pc \
+                   /usr/include"
-- 
cgit v1.2.3-54-g00ecf