chore: more flexible key:is_private()

close #307
zhaozg · Mar 31, 2024 · 112372f · 112372f
1 parent 36ea101
commit 112372f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/pkey.c b/src/pkey.c
@@ -20,6 +20,7 @@ int openssl_pkey_is_private(EVP_PKEY* pkey)
   int ret = 0;
   int typ;
   assert(pkey != NULL);
+
   typ = EVP_PKEY_type(EVP_PKEY_id(pkey));
   switch (typ)
   {
@@ -67,6 +68,14 @@ int openssl_pkey_is_private(EVP_PKEY* pkey)
   }
 #endif
   default:
+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
+  {
+    EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new_from_pkey(NULL, pkey, NULL);
+    if (EVP_PKEY_private_check(ctx))
+      ret = 1;
+    EVP_PKEY_CTX_free(ctx);
+  }
+#endif
     break;
   }
 

diff --git a/test/4.pkey.lua b/test/4.pkey.lua
@@ -109,6 +109,16 @@ function TestPKEYMY:testBasic()
   end
 end
 
+if helper.openssl3 then
+  function testED25519()
+    local key = openssl.pkey.ctx_new('ED25519'):keygen()
+    assert(key:is_private())
+    local pem = key:export('pem')
+    key = openssl.pkey.read(pem, true, 'pem')
+    assert(key:is_private())
+  end
+end
+
 function testRSA()
   local nrsa = {'rsa',  1024,  3}
   local rsa = pkey.new(unpack(nrsa))