mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-04-20 10:46:59 +02:00
96eb0e947a
available at https://github.com/wahern/luaossl/pull/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.
67 lines
2 KiB
Diff
67 lines
2 KiB
Diff
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 6/9] pkey.new: accept option table
|
|
|
|
---
|
|
src/openssl.c | 20 +++++++++++++++-----
|
|
1 file changed, 15 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/openssl.c b/src/openssl.c
|
|
index e5a19b8..9de08b4 100644
|
|
--- a/src/openssl.c
|
|
+++ b/src/openssl.c
|
|
@@ -4065,7 +4065,7 @@ static BIO *getbio(lua_State *L) {
|
|
static int pk_new(lua_State *L) {
|
|
EVP_PKEY **ud;
|
|
|
|
- /* #1 table or key; if key, #2 format and #3 type */
|
|
+ /* #1 table or key; if key, #2 option table or format; if format, #3 type */
|
|
lua_settop(L, 3);
|
|
|
|
if (lua_istable(L, 1) || lua_isnil(L, 1)) {
|
|
@@ -4299,7 +4299,7 @@ static int pk_new(lua_State *L) {
|
|
#endif
|
|
} /* switch() */
|
|
} else if (lua_isstring(L, 1)) {
|
|
- int format = optencoding(L, 2, "*", X509_ANY|X509_PEM|X509_DER);
|
|
+ int format;
|
|
int pubonly = 0, prvtonly = 0;
|
|
const char *type, *data;
|
|
size_t len;
|
|
@@ -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);
|
|
+ }
|
|
+
|
|
+ /* #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 (xtolower(type[0]) == 'p' && xtolower(type[1]) == 'u') {
|
|
@@ -4314,12 +4326,10 @@ static int pk_new(lua_State *L) {
|
|
} else if (xtolower(type[0]) == 'p' && xtolower(type[1]) == 'r') {
|
|
prvtonly = 1;
|
|
} else {
|
|
- return luaL_argerror(L, 3, lua_pushfstring(L, "invalid type: %s", type));
|
|
+ return luaL_error(L, "invalid key type: %s", type);
|
|
}
|
|
}
|
|
|
|
- data = luaL_checklstring(L, 1, &len);
|
|
-
|
|
ud = prepsimple(L, PKEY_CLASS);
|
|
|
|
if (!(bio = BIO_new_mem_buf((void *)data, len)))
|
|
--
|
|
2.48.1
|
|
|