chore: refactor for libressl 3.9.0

zhaozg · Jan 1, 2025 · 1f345e9 · 1f345e9
1 parent deeef7b
commit 1f345e9
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/src/digest.c b/src/digest.c
@@ -458,6 +458,7 @@ static LUA_FUNCTION(openssl_digest_ctx_data)
 
 #if defined(LIBRESSL_VERSION_NUMBER)
   /* without EVP_MD_meth_get_app_datasize */
+  (void)ctx;
   return 0;
 #else
 

diff --git a/src/lhash.c b/src/lhash.c
@@ -30,7 +30,7 @@ static void table2data(lua_State*L, int idx, BIO* bio)
 }
 #endif
 
-#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x40000000L
+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x30900000L
 static LUA_FUNCTION(openssl_lhash_read)
 {
   long eline = -1;

diff --git a/src/openssl.c b/src/openssl.c
@@ -150,7 +150,7 @@ static LUA_FUNCTION(openssl_list)
   {
     OBJ_NAME_TYPE_MD_METH,
     OBJ_NAME_TYPE_CIPHER_METH,
-#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x40000000L
+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x30900000L
     /* NOTE: libressl 4.0.0 */
     OBJ_NAME_TYPE_PKEY_METH,
     OBJ_NAME_TYPE_COMP_METH
@@ -159,7 +159,7 @@ static LUA_FUNCTION(openssl_list)
   static const char *names[] = {
     "digests",
     "ciphers",
-#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x40000000L
+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x30900000L
     "pkeys",
     "comps",
 #endif
@@ -583,7 +583,7 @@ LUALIB_API int luaopen_openssl(lua_State*L)
 
   luaL_setfuncs(L, eay_functions, 0);
 
-#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x40000000L
+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x30900000L
   /* NOTE: refact lhash/conf module */
   openssl_register_lhash(L);
 #endif

diff --git a/src/ots.c b/src/ots.c
@@ -36,7 +36,7 @@ static int openssl_ts_msg_imprint_new(lua_State *L)
   if (ret == 1)
   {
     X509_ALGOR* alg = X509_ALGOR_new();
-#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x40000000L
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30900000L
     X509_ALGOR_set0(alg, OBJ_nid2obj(EVP_MD_type(md)), V_ASN1_NULL, NULL);
 #else
     X509_ALGOR_set_md(alg, md);

diff --git a/src/private.h b/src/private.h
@@ -219,7 +219,7 @@ const X509_ALGOR *OCSP_resp_get0_tbs_sigalg(const OCSP_BASICRESP *bs);
   lua_pop(L,1);                                             \
 }
 
-#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x40000000L
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30900000L
 #if !defined(OPENSSL_NO_CRYPTO_MDEBUG)
 #define OPENSSL_NO_CRYPTO_MDEBUG
 #endif

diff --git a/src/x509.c b/src/x509.c
@@ -26,7 +26,7 @@ static int openssl_push_purpose(lua_State*L, const X509_PURPOSE* purpose)
 
   AUXILIAR_SET(L, -1, "purpose", X509_PURPOSE_get_id(purpose), integer);
 
-#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x40000000L
+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x30900000L
   AUXILIAR_SET(L, -1, "trust", X509_PURPOSE_get_trust(purpose), integer);
   AUXILIAR_SET(L, -1, "flags", purpose->flags, integer);
 #endif

diff --git a/src/xalgor.c b/src/xalgor.c
@@ -84,7 +84,7 @@ static int openssl_xalgor_md(lua_State* L)
 {
   X509_ALGOR* alg = CHECK_OBJECT(1, X509_ALGOR, "openssl.x509_algor");
   const EVP_MD* md = get_digest(L, 2, NULL);
-#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x40000000L
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30900000L
   X509_ALGOR_set0(alg, OBJ_nid2obj(EVP_MD_type(md)), V_ASN1_NULL, NULL);
 #else
   X509_ALGOR_set_md(alg, md);