diff options
| author | lbonn <lbonn@users.noreply.github.com> | 2018-05-22 09:47:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-22 09:47:32 +0200 |
| commit | 52e20c85e8a39f3d9bfc27448f235c34b31491e6 (patch) | |
| tree | 1b5de20ce437b66e832e7d7e9b612862fb76434f /recipes-support | |
| parent | b7cc58bcbcc712d5403572d071c3139cd47d5d4c (diff) | |
| parent | 05b971db716352d346744ebd2dd3f5b1de3f83b8 (diff) | |
| download | meta-updater-52e20c85e8a39f3d9bfc27448f235c34b31491e6.tar.gz | |
Merge pull request #315 from advancedtelematic/sumo-candidate
Update master with recent fixes
Diffstat (limited to 'recipes-support')
| -rw-r--r-- | recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch | 2 |
1 files changed, 1 insertions, 1 deletions
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 bd233ee..902352c 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 < 0x100020f0L || defined(LIBRESSL_VERSION_NUMBER) | 20 | +#if OPENSSL_VERSION_NUMBER < 0x10002100L || 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 |