File 0105-crypto-No-warnings-when-compiling-otp_test... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0105-crypto-No-warnings-when-compiling-otp_test_engine-wi.patch of Package erlang (Revision 31aed6575abf830123194bb955e96447)

Currently displaying revision 31aed6575abf830123194bb955e96447 , Show latest

From 1eff02b36ee02e277dc6ffef10832e3b7958a4e5 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Fri, 24 Sep 2021 09:24:19 +0200
Subject: [PATCH 3/3] crypto: No warnings when compiling otp_test_engine with
 0.9.8

---
 lib/crypto/c_src/Makefile.in       | 2 +-
 lib/crypto/c_src/otp_test_engine.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index d360d9b6cb..1af18b5879 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -181,7 +181,7 @@ static_lib: $(NIF_ARCHIVE)
 
 $(OBJDIR)/otp_test_engine$(TYPEMARKER).o: otp_test_engine.c
 	$(V_at)$(INSTALL_DIR) $(OBJDIR)
-	$(V_CC) -c -o $@ $(ALL_CFLAGS) $<
+	$(V_CC) -c -o $@ $(filter-out -Wmissing-prototypes,$(ALL_CFLAGS)) $<
 
 $(LIBDIR)/otp_test_engine$(TYPEMARKER).so: $(TEST_ENGINE_OBJS)
 	$(V_at)$(INSTALL_DIR) $(LIBDIR)
diff --git a/lib/crypto/c_src/otp_test_engine.c b/lib/crypto/c_src/otp_test_engine.c
index f5fff85b14..cee251a280 100644
--- a/lib/crypto/c_src/otp_test_engine.c
+++ b/lib/crypto/c_src/otp_test_engine.c
@@ -59,6 +59,7 @@
 /* If OPENSSL_NO_EC is set, there will be an error in ec.h included from engine.h
    So if EC is disabled, you can't use Engine either....
 */
+
 #include <openssl/engine.h>
 #include <openssl/pem.h>
 
@@ -192,7 +193,9 @@ static EVP_MD test_engine_md5_method=  {
         EVP_PKEY_NULL_method,         /* IGNORED: pkey methods */
         MD5_CBLOCK,                   /* Internal blocksize, see rfc1321/md5.h */
         sizeof(EVP_MD *) + sizeof(MD5_CTX),
+# if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
         NULL,                          /* IGNORED: control function */
+# endif
 };
 #endif
 
-- 
2.31.1

Places

File 0105-crypto-No-warnings-when-compiling-otp_test_engine-wi.patch of Package erlang (Revision 31aed6575abf830123194bb955e96447)

Places