diff options
-rw-r--r-- | README.adoc | 2 | ||||
-rw-r--r-- | recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/README.adoc b/README.adoc index 403e0f8..8246a31 100644 --- a/README.adoc +++ b/README.adoc | |||
@@ -133,7 +133,7 @@ The https://github.com/advancedtelematic/aktualizr[aktualizr repo] contains a to | |||
133 | garage-push --repo=/path/to/ostree-repo --ref=mybranch --credentials=/path/to/credentials.zip | 133 | garage-push --repo=/path/to/ostree-repo --ref=mybranch --credentials=/path/to/credentials.zip |
134 | .... | 134 | .... |
135 | 135 | ||
136 | You can set SOTA_PACKED_CREDENTIALS in your local.conf to make your build results be automatically synchronized with a remote server. Credentials are stored in the JSON format described in the https://github.com/advancedtelematic/aktualizr/blob/master/README.sotatools.adoc[garage-push README]. This JSON file can be optionally stored inside a zip file, although if it is stored this way, the JSON file must be named treehub.json. | 136 | You can set `SOTA_PACKED_CREDENTIALS` in your `local.conf` to automatically synchronize your build results with a remote server. Credentials are stored in an archive as described in the https://github.com/advancedtelematic/aktualizr/blob/master/docs/credentials.adoc[aktualizr documentation]. |
137 | 137 | ||
138 | === QA | 138 | === QA |
139 | 139 | ||
diff --git a/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch b/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch index 0538eff..bd233ee 100644 --- a/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch +++ b/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch | |||
@@ -17,7 +17,7 @@ index 45d5ad3..75625e6 100644 | |||
17 | 17 | ||
18 | -#if OPENSSL_VERSION_NUMBER < 0x100020d0L || defined(LIBRESSL_VERSION_NUMBER) | 18 | -#if OPENSSL_VERSION_NUMBER < 0x100020d0L || defined(LIBRESSL_VERSION_NUMBER) |
19 | -static void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth, | 19 | -static void EVP_PKEY_meth_get_sign(EVP_PKEY_METHOD *pmeth, |
20 | +#if OPENSSL_VERSION_NUMBER <= 0x100020e0L || defined(LIBRESSL_VERSION_NUMBER) | 20 | +#if OPENSSL_VERSION_NUMBER < 0x100020f0L || defined(LIBRESSL_VERSION_NUMBER) |
21 | + | 21 | + |
22 | +# if (OPENSSL_VERSION_NUMBER & 0xFFFFFFF0) == 0x100020d0L | 22 | +# if (OPENSSL_VERSION_NUMBER & 0xFFFFFFF0) == 0x100020d0L |
23 | +# undef EVP_PKEY_meth_get_sign | 23 | +# undef EVP_PKEY_meth_get_sign |