pkey: PEM password callback

src/openssl.c

@@ -3418,9 +3418,15 @@ static void pushbiostring(lua_State *L) {
 
 
 static int pem_pw_cb(char *buf, int size, int rwflag, void *u) {
-	if (!u)
+	lua_State *L = (lua_State *) u;
+
+	if (lua_isnil(L, -1) || (lua_isfunction(L, -1) && lua_pcall(L, 0, 1, 0)))
+		return 0;
+
+	const char *pass = lua_tostring(L, -1);
+	if (!pass)
 		return 0;
-	char *pass = (char *) u;
+
 	strncpy(buf, pass, size);
 	return MIN(strlen(pass), (unsigned int) size);
 } /* pem_password_cb() */
@@ -3636,7 +3642,7 @@ static int pk_new(lua_State *L) {
 	} else if (lua_isstring(L, 1)) {
 		int type = optencoding(L, 2, "*", X509_ANY|X509_PEM|X509_DER);
 		int pubonly = 0, prvtonly = 0;
-		const char *opt, *data, *pass;
+		const char *opt, *data;
 		size_t len;
 		BIO *bio;
 		EVP_PKEY *pub = NULL, *prvt = NULL;
@@ -3654,9 +3660,6 @@ static int pk_new(lua_State *L) {
 		}
 
 		data = luaL_checklstring(L, 1, &len);
-		pass = luaL_optstring(L, 4, NULL);
-
-		ud = prepsimple(L, PKEY_CLASS);
 
 		if (!(bio = BIO_new_mem_buf((void *)data, len)))
 			return auxL_error(L, auxL_EOPENSSL, "pkey.new");
@@ -3670,14 +3673,14 @@ static int pk_new(lua_State *L) {
 				 */
 				BIO_reset(bio);
 
-				if (!(pub = PEM_read_bio_PUBKEY(bio, NULL, pem_pw_cb, pass)))
+				if (!(pub = PEM_read_bio_PUBKEY(bio, NULL, pem_pw_cb, L)))
 					goterr = 1;
 			}
 
 			if (!pubonly && !prvt) {
 				BIO_reset(bio);
 
-				if (!(prvt = PEM_read_bio_PrivateKey(bio, NULL, pem_pw_cb, pass)))
+				if (!(prvt = PEM_read_bio_PrivateKey(bio, NULL, pem_pw_cb, L)))
 					goterr = 1;
 			}
 		}
@@ -3698,6 +3701,8 @@ static int pk_new(lua_State *L) {
 			}
 		}
 
+		ud = prepsimple(L, PKEY_CLASS);
+
 		if (prvt) {
 #if 0
 			/* TODO: Determine if this is necessary. */
@@ -4100,17 +4105,16 @@ static int pk_toPEM(lua_State *L) {
 static int pk_getPrivateKey(lua_State *L) {
 	EVP_PKEY *key = checksimple(L, 1, PKEY_CLASS);
 	const char *cname = luaL_optstring(L, 2, NULL);
-	const char *pass = NULL;
 	EVP_CIPHER *cipher = NULL;
+	lua_settop(L, 3);
 
 	if (cname) {
-		pass = luaL_checkstring(L, 3);
 		cipher = EVP_get_cipherbyname(cname);
 		if (!cipher)
 			return luaL_error(L, "pkey:getPrivateKey: unknown cipher: %s", cname);
 	}
 
-	if (!PEM_write_bio_PrivateKey(getbio(L), key, cipher, NULL, 0, pem_pw_cb, pass))
+	if (!PEM_write_bio_PrivateKey(getbio(L), key, cipher, NULL, 0, pem_pw_cb, L))
 		return auxL_error(L, auxL_EOPENSSL, "pkey:getPrivateKey");
 	pushbiostring(L);
 	return 1;