main/lua-ossl: align with latest patch set

available at wahern/luaossl#128

Earlier, an empty password was returned when the callback raised a Lua
error. Now the error is propagated to the OpenSSL level.

This commit also enables the -dbg subpackage.

Author: kunkku

main/lua-ossl/0001-pkey.toPEM-opts-rename-const-array.patch

@@ -1,14 +1,14 @@
-From 4589f5b1a5c2cbeab2069f9cdce605bc3a3096fb Mon Sep 17 00:00:00 2001
+From db281ae9a12ce7518a92002c782ef697fc875f9c 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
+Subject: [PATCH 1/9] 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
+index c3547bb..35ff49a 100644
 --- a/src/openssl.c
 +++ b/src/openssl.c
 @@ -4675,14 +4675,14 @@ static int pk_toPEM(lua_State *L) {
@@ -29,5 +29,5 @@ index 9a9de0f..acb8289 100644
  			if (!PEM_write_bio_PUBKEY(bio, key))
  				return auxL_error(L, auxL_EOPENSSL, "pkey:__tostring");
 -- 
-2.24.1
+2.48.1
 

main/lua-ossl/0002-pkey.toPEM-accept-table-arguments.patch

@@ -1,14 +1,14 @@
-From 2fb6331a5304927fcfe915d5d42535d3d500f540 Mon Sep 17 00:00:00 2001
+From 24ff6dab4a15529b1c71e3c70119cde65976dfcf Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Sun, 2 Sep 2018 13:18:48 +0300
-Subject: [PATCH 02/10] pkey.toPEM: accept table arguments
+Subject: [PATCH 2/9] pkey.toPEM: accept table arguments
 
 ---
  src/openssl.c | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/src/openssl.c b/src/openssl.c
-index acb8289..1905693 100644
+index 35ff49a..6df0a17 100644
 --- a/src/openssl.c
 +++ b/src/openssl.c
 @@ -4681,8 +4681,17 @@ static int pk_toPEM(lua_State *L) {
@@ -31,5 +31,5 @@ index acb8289..1905693 100644
  			if (!PEM_write_bio_PUBKEY(bio, key))
  				return auxL_error(L, auxL_EOPENSSL, "pkey:__tostring");
 -- 
-2.24.1
+2.48.1
 

main/lua-ossl/0003-pkey.toPEM-private-key-encryption.patch

@@ -1,14 +1,14 @@
-From 367597c9fbbd8c0179a8b2a75e5b0819ef5bc5d6 Mon Sep 17 00:00:00 2001
+From 2f246ccfaba1c7a83274157ef917c0c169810d49 Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Mon, 30 Apr 2018 13:26:16 +0300
-Subject: [PATCH 03/10] pkey.toPEM: private key encryption
+Subject: [PATCH 3/9] pkey.toPEM: private key encryption
 
 ---
  src/openssl.c | 25 +++++++++++++++++++------
  1 file changed, 19 insertions(+), 6 deletions(-)
 
 diff --git a/src/openssl.c b/src/openssl.c
-index 1905693..9b10165 100644
+index 6df0a17..9432407 100644
 --- a/src/openssl.c
 +++ b/src/openssl.c
 @@ -31,7 +31,7 @@
@@ -59,5 +59,5 @@ index 1905693..9b10165 100644
 
  			len = BIO_get_mem_data(bio, &pem);
 -- 
-2.24.1
+2.48.1
 

main/lua-ossl/0004-pkey.new-type-rename-variable.patch

@@ -1,14 +1,14 @@
-From f287bd7a314458a3870ee4e7fbdfc7e0ea41a4b6 Mon Sep 17 00:00:00 2001
+From 312269de413d42c7049e87ed81a6449807c79069 Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Sun, 2 Sep 2018 14:22:43 +0300
-Subject: [PATCH 04/10] pkey.new: type: rename variable
+Subject: [PATCH 4/9] pkey.new: type: rename variable
 
 ---
  src/openssl.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/openssl.c b/src/openssl.c
-index 9b10165..ed18e60 100644
+index 9432407..7fef0e3 100644
 --- a/src/openssl.c
 +++ b/src/openssl.c
 @@ -4299,7 +4299,7 @@ static int pk_new(lua_State *L) {
@@ -39,5 +39,5 @@ index 9b10165..ed18e60 100644
  				BIO_reset(bio);
 
 -- 
-2.24.1
+2.48.1
 

main/lua-ossl/0005-pkey.new-opt-rename-variable.patch

@@ -1,14 +1,14 @@
-From 31403e7892b554458edc28a43f6f0552f3f27bac Mon Sep 17 00:00:00 2001
+From 1d6f15950ae7834e2d49e7709e4a723a96eb8f46 Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Sun, 2 Sep 2018 14:24:51 +0300
-Subject: [PATCH 05/10] pkey.new: opt: rename variable
+Subject: [PATCH 5/9] pkey.new: opt: rename variable
 
 ---
  src/openssl.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/src/openssl.c b/src/openssl.c
-index ed18e60..5904bf1 100644
+index 7fef0e3..e5a19b8 100644
 --- a/src/openssl.c
 +++ b/src/openssl.c
 @@ -4301,20 +4301,20 @@ static int pk_new(lua_State *L) {
@@ -38,5 +38,5 @@ index ed18e60..5904bf1 100644
  		}
 
 -- 
-2.24.1
+2.48.1
 

main/lua-ossl/0006-optencoding-allow-negative-indices.patch

@@ -1,17 +1,17 @@
-From 07e298a09b20f24d7a1efede41c04f398bb1022a Mon Sep 17 00:00:00 2001
+From 53fd95f0c06d3c521c48dd01206f7d8b002f4625 Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Sun, 2 Sep 2018 14:44:46 +0300
-Subject: [PATCH 07/10] pkey.new: accept option table
+Subject: [PATCH 6/9] pkey.new: accept option table
 
 ---
- src/openssl.c | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
+ src/openssl.c | 20 +++++++++++++++-----
+ 1 file changed, 15 insertions(+), 5 deletions(-)
 
 diff --git a/src/openssl.c b/src/openssl.c
-index cb38f2f..2aaa5d8 100644
+index e5a19b8..9de08b4 100644
 --- a/src/openssl.c
 +++ b/src/openssl.c
-@@ -4073,7 +4073,7 @@ static BIO *getbio(lua_State *L) {
+@@ -4065,7 +4065,7 @@ static BIO *getbio(lua_State *L) {
  static int pk_new(lua_State *L) {
  	EVP_PKEY **ud;
 
@@ -20,7 +20,7 @@ index cb38f2f..2aaa5d8 100644
  	lua_settop(L, 3);
 
  	if (lua_istable(L, 1) || lua_isnil(L, 1)) {
-@@ -4307,7 +4307,7 @@ static int pk_new(lua_State *L) {
+@@ -4299,7 +4299,7 @@ static int pk_new(lua_State *L) {
  #endif
  		} /* switch() */
  	} else if (lua_isstring(L, 1)) {
@@ -29,22 +29,26 @@ index cb38f2f..2aaa5d8 100644
  		int pubonly = 0, prvtonly = 0;
  		const char *type, *data;
  		size_t len;
-@@ -4315,14 +4315,21 @@ static int pk_new(lua_State *L) {
+@@ -4307,6 +4307,18 @@ static int pk_new(lua_State *L) {
  		EVP_PKEY *pub = NULL, *prvt = NULL;
  		int goterr = 0;
 
 +		if (lua_istable(L, 2)) {
++			lua_pop(L, 1);
 +			lua_getfield(L, 2, "format");
 +			lua_getfield(L, 2, "type");
++			lua_remove(L, 2);
 +		}
 +
-+		format = optencoding(L, -2, "*", X509_ANY|X509_PEM|X509_DER);
++		/* #1 key, #2 format, #3 type */
++
++		data = luaL_checklstring(L, 1, &len);
++		format = optencoding(L, 2, "*", X509_ANY|X509_PEM|X509_DER);
 +
  		/* check if specified publickey or privatekey */
--		if ((type = luaL_optstring(L, 3, NULL))) {
-+		if ((type = luaL_optstring(L, -1, NULL))) {
+ 		if ((type = luaL_optstring(L, 3, NULL))) {
  			if (xtolower(type[0]) == 'p' && xtolower(type[1]) == 'u') {
- 				pubonly = 1;
+@@ -4314,12 +4326,10 @@ static int pk_new(lua_State *L) {
  			} else if (xtolower(type[0]) == 'p' && xtolower(type[1]) == 'r') {
  				prvtonly = 1;
  			} else {
@@ -53,6 +57,11 @@ index cb38f2f..2aaa5d8 100644
  			}
  		}
 
+-		data = luaL_checklstring(L, 1, &len);
+-
+ 		ud = prepsimple(L, PKEY_CLASS);
+ 
+ 		if (!(bio = BIO_new_mem_buf((void *)data, len)))
 -- 
-2.24.1
+2.48.1
 

…/0007-pkey.new-accept-option-table.patch …/0006-pkey.new-accept-option-table.patchmain/lua-ossl/0007-pkey.new-accept-option-table.patch renamed to main/lua-ossl/0006-pkey.new-accept-option-table.patch main/lua-ossl/0007-pkey.new-accept-option-table.patch renamed to main/lua-ossl/0006-pkey.new-accept-option-table.patch

@@ -1,14 +1,14 @@
-From 132ac48cea935829c31f873aaab920a940bc6b98 Mon Sep 17 00:00:00 2001
+From e66093e81cacacfabed9519b9cf4d58db6424256 Mon Sep 17 00:00:00 2001
 From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 Date: Mon, 30 Apr 2018 13:49:57 +0300
-Subject: [PATCH 08/10] pkey.new: decryption
+Subject: [PATCH 7/9] pkey.new: decryption
 
 ---
- src/openssl.c | 32 +++++++++++++++++++++++++-------
- 1 file changed, 25 insertions(+), 7 deletions(-)
+ src/openssl.c | 30 ++++++++++++++++++++++++------
+ 1 file changed, 24 insertions(+), 6 deletions(-)
 
 diff --git a/src/openssl.c b/src/openssl.c
-index 2aaa5d8..937ffa6 100644
+index 9de08b4..dd46fb9 100644
 --- a/src/openssl.c
 +++ b/src/openssl.c
 @@ -31,7 +31,7 @@
@@ -20,13 +20,13 @@ index 2aaa5d8..937ffa6 100644
  #include <math.h>         /* INFINITY fabs(3) floor(3) frexp(3) fmod(3) round(3) isfinite(3) */
  #include <time.h>         /* struct tm time_t strptime(3) time(2) */
  #include <ctype.h>        /* isdigit(3), isxdigit(3), tolower(3) */
-@@ -4070,6 +4070,15 @@ static BIO *getbio(lua_State *L) {
+@@ -4062,6 +4062,15 @@ static BIO *getbio(lua_State *L) {
  } /* getbio() */
 
 
 +static int pem_pw_cb(char *buf, int size, int rwflag, void *u) {
 +	if (!u)
-+		return 0;
++		return -1;
 +	char *pass = (char *) u;
 +	strncpy(buf, pass, size);
 +	return MIN(strlen(pass), (unsigned int) size);
@@ -36,7 +36,7 @@ index 2aaa5d8..937ffa6 100644
  static int pk_new(lua_State *L) {
  	EVP_PKEY **ud;
 
-@@ -4309,7 +4318,7 @@ static int pk_new(lua_State *L) {
+@@ -4301,7 +4310,7 @@ static int pk_new(lua_State *L) {
  	} else if (lua_isstring(L, 1)) {
  		int format;
  		int pubonly = 0, prvtonly = 0;
@@ -45,39 +45,36 @@ index 2aaa5d8..937ffa6 100644
  		size_t len;
  		BIO *bio;
  		EVP_PKEY *pub = NULL, *prvt = NULL;
-@@ -4318,12 +4327,14 @@ static int pk_new(lua_State *L) {
- 		if (lua_istable(L, 2)) {
+@@ -4311,10 +4320,12 @@ static int pk_new(lua_State *L) {
+ 			lua_pop(L, 1);
  			lua_getfield(L, 2, "format");
  			lua_getfield(L, 2, "type");
--		}
 +			lua_getfield(L, 2, "password");
+ 			lua_remove(L, 2);
+-		}
 +		} else
 +			lua_pushnil(L);
 
--		format = optencoding(L, -2, "*", X509_ANY|X509_PEM|X509_DER);
-+		format = optencoding(L, -3, "*", X509_ANY|X509_PEM|X509_DER);
+-		/* #1 key, #2 format, #3 type */
++		/* #1 key, #2 format, #3 type, #4 password or callback */
 
- 		/* check if specified publickey or privatekey */
--		if ((type = luaL_optstring(L, -1, NULL))) {
-+		if ((type = luaL_optstring(L, -2, NULL))) {
- 			if (xtolower(type[0]) == 'p' && xtolower(type[1]) == 'u') {
- 				pubonly = 1;
- 			} else if (xtolower(type[0]) == 'p' && xtolower(type[1]) == 'r') {
-@@ -4333,6 +4344,13 @@ static int pk_new(lua_State *L) {
+ 		data = luaL_checklstring(L, 1, &len);
+ 		format = optencoding(L, 2, "*", X509_ANY|X509_PEM|X509_DER);
+@@ -4330,6 +4341,13 @@ static int pk_new(lua_State *L) {
  			}
  		}
 
-+		pass = luaL_optstring(L, -1, NULL);
++		pass = luaL_optstring(L, 4, NULL);
 +		if (pass) {
 +			if (format == X509_DER)
 +				return luaL_error(L, "decryption supported only for PEM keys");
 +			else format = X509_PEM;
 +		}
 +
- 		data = luaL_checklstring(L, 1, &len);
- 
  		ud = prepsimple(L, PKEY_CLASS);
-@@ -4349,14 +4367,14 @@ static int pk_new(lua_State *L) {
+ 
+ 		if (!(bio = BIO_new_mem_buf((void *)data, len)))
+@@ -4344,14 +4362,14 @@ static int pk_new(lua_State *L) {
  				 */
  				BIO_reset(bio);
 
@@ -95,5 +92,5 @@ index 2aaa5d8..937ffa6 100644
  			}
  		}
 -- 
-2.24.1
+2.48.1
 

…/lua-ossl/0008-pkey.new-decryption.patch …/lua-ossl/0007-pkey.new-decryption.patchmain/lua-ossl/0008-pkey.new-decryption.patch renamed to main/lua-ossl/0007-pkey.new-decryption.patch main/lua-ossl/0008-pkey.new-decryption.patch renamed to main/lua-ossl/0007-pkey.new-decryption.patch

@@ -1,17 +1,17 @@
-From 4899a210dfdd91fa75b77601d29df0152aecc382 Mon Sep 17 00:00:00 2001
+From 482c51d69e7985a17c560c9d44e2c60105a814f2 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 09/10] pkey.toPEM: use password callback
+Subject: [PATCH 8/9] pkey.toPEM: 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 937ffa6..3af285b 100644
+index dd46fb9..9857603 100644
 --- a/src/openssl.c
 +++ b/src/openssl.c
-@@ -4748,7 +4748,7 @@ static int pk_toPEM(lua_State *L) {
+@@ -4743,7 +4743,7 @@ static int pk_toPEM(lua_State *L) {
  					return luaL_error(L, "pkey:toPEM: password not defined");
  			}
 
@@ -21,5 +21,5 @@ index 937ffa6..3af285b 100644
 
  			len = BIO_get_mem_data(bio, &pem);
 -- 
-2.24.1
+2.48.1