perf(kdf) use table.nkeys for params

Author: fffonion

lib/resty/openssl/auxiliary/compat.lua

@@ -0,0 +1,20 @@
+local nkeys
+
+do
+  local pok, perr = pcall(require, "table.nkeys")
+  if pok then
+    nkeys = perr
+  else
+    nkeys = function(tbl)
+      local cnt = 0
+      for _ in pairs(tbl) do
+          cnt = cnt + 1
+      end
+      return cnt
+    end
+  end
+end
+
+return {
+  nkeys = nkeys,
+}

lib/resty/openssl/kdf.lua

@@ -13,6 +13,7 @@ local format_error = require("resty.openssl.err").format_error
 local version_text = require("resty.openssl.version").version_text
 local OPENSSL_3X = require("resty.openssl.version").OPENSSL_3X
 local ctypes = require "resty.openssl.auxiliary.ctypes"
+local nkeys = require "resty.openssl.auxiliary.compat".nkeys
 
 --[[
 https://wiki.openssl.org/index.php/EVP_Key_Derivation
@@ -311,6 +312,7 @@ function _M.new(typ, properties)
     algo = algo,
     buf = buf,
     buf_size = buf_size,
+    schema = nil,
   }, mt), nil
 end
 
@@ -344,14 +346,16 @@ function _M:derive(outlen, options, options_count)
   if options_count then
     options_count = options_count - 1
   else
-    options_count = 0
-    for k, v in pairs(options) do options_count = options_count + 1 end
+    options_count = nkeys(options)
   end
 
   local param, err
   if options_count > 0 then
-    local schema = self:settable_params(true) -- raw schema
-    param, err = param_lib.construct(options, nil, schema)
+    if not self.schema then
+      self.schema = self:settable_params(true) -- raw schema
+    end
+
+    param, err = param_lib.construct(options, nil, self.schema)
     if err then
       return nil, "kdf:derive: " .. err
     end

lib/resty/openssl/param.lua

@@ -8,6 +8,7 @@ require "resty.openssl.include.param"
 local format_error = require("resty.openssl.err").format_error
 local bn_lib = require("resty.openssl.bn")
 local null = require("resty.openssl.auxiliary.ctypes").null
+local nkeys = require "resty.openssl.auxiliary.compat".nkeys
 
 local OSSL_PARAM_INTEGER = 1
 local OSSL_PARAM_UNSIGNED_INTEGER = 2
@@ -22,8 +23,7 @@ local buf_param_key = {}
 
 local function construct(buf_t, length, types_map, types_size)
   if not length then
-    length = 0
-    for k, v in pairs(buf_t) do length = length + 1 end
+    length = nkeys(buf_t)
   end
 
   local params = ffi_new("OSSL_PARAM[?]", length + 1)

lua-resty-openssl-1.1.0-1.rockspec

@@ -15,6 +15,7 @@ build = {
       ["resty.openssl"] = "lib/resty/openssl.lua",
       ["resty.openssl.asn1"] = "lib/resty/openssl/asn1.lua",
       ["resty.openssl.auxiliary.bio"] = "lib/resty/openssl/auxiliary/bio.lua",
+      ["resty.openssl.auxiliary.compat"] = "lib/resty/openssl/auxiliary/compat.lua",
       ["resty.openssl.auxiliary.ctypes"] = "lib/resty/openssl/auxiliary/ctypes.lua",
       ["resty.openssl.auxiliary.ecdsa"] = "lib/resty/openssl/auxiliary/ecdsa.lua",
       ["resty.openssl.auxiliary.jwk"] = "lib/resty/openssl/auxiliary/jwk.lua",