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/0004-pkey.getPrivateKey-use-password-callback.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/0004-pkey.getPrivateKey-use-password-callback.patch')
| -rw-r--r-- | main/lua-ossl/0004-pkey.getPrivateKey-use-password-callback.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/main/lua-ossl/0004-pkey.getPrivateKey-use-password-callback.patch b/main/lua-ossl/0004-pkey.getPrivateKey-use-password-callback.patch deleted file mode 100644 index b9317c59a3..0000000000 --- a/main/lua-ossl/0004-pkey.getPrivateKey-use-password-callback.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a1bbc97c659e72f110f68d37c2b09ef1cf32b46a Mon Sep 17 00:00:00 2001 -From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> -Date: Thu, 3 May 2018 21:21:16 +0300 -Subject: [PATCH 4/5] pkey.getPrivateKey: use password callback - ---- - src/openssl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/openssl.c b/src/openssl.c -index 2e6d802..be585fe 100644 ---- a/src/openssl.c -+++ b/src/openssl.c -@@ -4130,7 +4130,7 @@ static int pk_getPrivateKey(lua_State *L) { - char *str; - long len; - -- if (!PEM_write_bio_PrivateKey(bio, key, cipher, pass, pass ? strlen(pass) : 0, 0, 0)) -+ if (!PEM_write_bio_PrivateKey(bio, key, cipher, NULL, 0, pem_pw_cb, pass)) - return auxL_error(L, auxL_EOPENSSL, "pkey:getPrivateKey"); - len = BIO_get_mem_data(bio, &str); - lua_pushlstring(L, str, len); --- -2.18.0 - |