File 1251-crypto-New-internal-and-experimental-funct... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1251-crypto-New-internal-and-experimental-function-for-te.patch of Package erlang (Revision 9fe15014952aba0ee82351ad543c0798)

Currently displaying revision 9fe15014952aba0ee82351ad543c0798 , Show latest

From b48707f944b98c06548a57054f512d4d174a0940 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 17 Aug 2021 13:33:52 +0200
Subject: [PATCH 1/3] crypto: New internal and experimental function for tests:
 info/0

---
 lib/crypto/c_src/crypto.c |  1 +
 lib/crypto/c_src/info.c   | 57 ++++++++++++++++++++++++++++++++-------
 lib/crypto/c_src/info.h   |  2 ++
 lib/crypto/src/crypto.erl |  7 ++++-
 4 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 16d1e3a020..a79bd12fca 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -59,6 +59,7 @@ static int library_refc = 0; /* number of users of this dynamic library */
 static int library_initialized = 0;
 
 static ErlNifFunc nif_funcs[] = {
+    {"info_nif", 0, info_nif, 0},
     {"info_lib", 0, info_lib, 0},
     {"info_fips", 0, info_fips, 0},
     {"enable_fips_mode_nif", 1, enable_fips_mode_nif, 0},
diff --git a/lib/crypto/c_src/info.c b/lib/crypto/c_src/info.c
index 1d7e744995..df54169e06 100644
--- a/lib/crypto/c_src/info.c
+++ b/lib/crypto/c_src/info.c
@@ -20,17 +20,35 @@
 
 #include "info.h"
 
+#if defined(DEBUG)
+#  define CB_NAME "crypto_callback.debug"
+#  define COMPILE_TYPE "debug"
+
+#elif defined(VALGRIND)
+#  define CB_NAME "crypto_callback.valgrind"
+#  define COMPILE_TYPE "valgrind"
+
+#elif defined(ADDRESS_SANITIZER)
+#  define CB_NAME "crypto_callback.asan"
+#  define COMPILE_TYPE "asan"
+
+#else
+#  define CB_NAME "crypto_callback"
+#  define COMPILE_TYPE "normal"
+
+#endif
+
+
+#if defined(HAVE_DYNAMIC_CRYPTO_LIB)
+#  define LINK_TYPE "dynamic"
+#else
+#  define LINK_TYPE "static"
+#endif
+
+
 #ifdef HAVE_DYNAMIC_CRYPTO_LIB
 
-# if defined(DEBUG)
-char *crypto_callback_name = "crypto_callback.debug";
-# elif defined(VALGRIND)
-char *crypto_callback_name = "crypto_callback.valgrind";
-# elif defined(ADDRESS_SANITIZER)
-char *crypto_callback_name = "crypto_callback.asan";
-# else
-char *crypto_callback_name = "crypto_callback";
-# endif
+char *crypto_callback_name = CB_NAME;
 
 int change_basename(ErlNifBinary* bin, char* buf, size_t bufsz, const char* newfile)
 {
@@ -64,6 +82,27 @@ void error_handler(void* null, const char* errstr)
 }
 #endif /* HAVE_DYNAMIC_CRYPTO_LIB */
 
+
+ERL_NIF_TERM info_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
+{/* () */
+    ERL_NIF_TERM  ret;
+
+    ret = enif_make_new_map(env);
+    
+    enif_make_map_put(env, ret,
+                      enif_make_atom(env,"compile_type"),
+                      enif_make_atom(env, COMPILE_TYPE),
+                      &ret);
+
+    enif_make_map_put(env, ret,
+                      enif_make_atom(env, "link_type"),
+                      enif_make_atom(env, LINK_TYPE),
+                      &ret);
+
+    return ret;
+}
+
+
 ERL_NIF_TERM info_lib(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
 {/* () */
     /* [{<<"OpenSSL">>,9470143,<<"OpenSSL 0.9.8k 25 Mar 2009">>}] */
diff --git a/lib/crypto/c_src/info.h b/lib/crypto/c_src/info.h
index 5d73ad3f4b..76bb3a8a58 100644
--- a/lib/crypto/c_src/info.h
+++ b/lib/crypto/c_src/info.h
@@ -32,4 +32,6 @@ void error_handler(void* null, const char* errstr);
 
 ERL_NIF_TERM info_lib(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 
+ERL_NIF_TERM info_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
 #endif /* E_INFO_H__ */
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 6a64774f71..5d72114055 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -22,7 +22,7 @@
 
 -module(crypto).
 
--export([start/0, stop/0, info_lib/0, info_fips/0, supports/0, enable_fips_mode/1,
+-export([start/0, stop/0, info/0, info_lib/0, info_fips/0, supports/0, enable_fips_mode/1,
          version/0, bytes_to_integer/1]).
 -export([cipher_info/1, hash_info/1]).
 -export([hash/2, hash_init/1, hash_update/2, hash_final/1]).
@@ -505,6 +505,11 @@ supports(rsa_opts)    -> rsa_opts_algorithms().
                                                 VerStr :: binary() .
 info_lib() -> ?nif_stub.
 
+%% info/0 and info_nif/0 are experimental. May disapear or change without warning.
+info() -> info_nif().
+info_nif() -> ?nif_stub.
+
+
 -spec info_fips() -> not_supported | not_enabled | enabled.
 
 info_fips() -> ?nif_stub.
-- 
2.31.1

Places

File 1251-crypto-New-internal-and-experimental-function-for-te.patch of Package erlang (Revision 9fe15014952aba0ee82351ad543c0798)

Places