diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2020-01-12 19:34:26 +0200 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2020-01-12 19:38:19 +0200 |
| commit | b9dd8d800b02628a678afd8c11582c4c1e53a412 (patch) | |
| tree | 9b3e76cb68c4460a01aa89e1bea96ffe3dd71f62 /main/lua-ossl/0001-pkey.toPEM-opts-rename-const-array.patch | |
| parent | e07ef0d0913e0270283fc755a077e72b0ed3d647 (diff) | |
| download | aports-b9dd8d800b02628a678afd8c11582c4c1e53a412.tar.bz2 aports-b9dd8d800b02628a678afd8c11582c4c1e53a412.tar.xz | |
main/lua-ossl: align with latest PEM encryption patch set
https://github.com/wahern/luaossl/pull/128
backwards incompatible
Diffstat (limited to 'main/lua-ossl/0001-pkey.toPEM-opts-rename-const-array.patch')
| -rw-r--r-- | main/lua-ossl/0001-pkey.toPEM-opts-rename-const-array.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/main/lua-ossl/0001-pkey.toPEM-opts-rename-const-array.patch b/main/lua-ossl/0001-pkey.toPEM-opts-rename-const-array.patch new file mode 100644 index 0000000000..8e43c16873 --- /dev/null +++ b/main/lua-ossl/0001-pkey.toPEM-opts-rename-const-array.patch @@ -0,0 +1,33 @@ +From 4589f5b1a5c2cbeab2069f9cdce605bc3a3096fb Mon Sep 17 00:00:00 2001 +From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> +Date: Sun, 2 Sep 2018 13:07:20 +0300 +Subject: [PATCH 01/10] pkey.toPEM: opts: rename const array + +--- + src/openssl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/openssl.c b/src/openssl.c +index 9a9de0f..acb8289 100644 +--- a/src/openssl.c ++++ b/src/openssl.c +@@ -4675,14 +4675,14 @@ static int pk_toPEM(lua_State *L) { + bio = getbio(L); + + for (i = 2; i <= top; i++) { +- static const char *const opts[] = { ++ static const char *const types[] = { + "public", "PublicKey", + "private", "PrivateKey", + // "params", "Parameters", + NULL, + }; + +- switch (auxL_checkoption(L, i, NULL, opts, 1)) { ++ switch (auxL_checkoption(L, i, NULL, types, 1)) { + case 0: case 1: /* public, PublicKey */ + if (!PEM_write_bio_PUBKEY(bio, key)) + return auxL_error(L, auxL_EOPENSSL, "pkey:__tostring"); +-- +2.24.1 + |