build: add --shared-ncrypto configure flag

Author: aduh95

.github/workflows/test-shared.yml

@@ -25,6 +25,7 @@ on:
       - deps/llhttp/**
       - deps/merve/**
       - deps/nbytes/**
+      - deps/ncrypto/**
       - deps/nghttp2/**
       - deps/ngtcp2/**
       - deps/openssl/*/**
@@ -75,6 +76,7 @@ on:
       - deps/llhttp/**
       - deps/merve/**
       - deps/nbytes/**
+      - deps/ncrypto/**
       - deps/nghttp2/**
       - deps/ngtcp2/**
       - deps/openssl/*/**

Makefile

@@ -1243,6 +1243,7 @@ ifeq ($(SKIP_SHARED_DEPS), 1)
 	$(RM) -r $(TARNAME)/deps/llhttp
 	$(RM) -r $(TARNAME)/deps/merve
 	$(RM) -r $(TARNAME)/deps/nbytes
+	$(RM) -r $(TARNAME)/deps/ncrypto
 	$(RM) -r $(TARNAME)/deps/nghttp2
 	$(RM) -r $(TARNAME)/deps/ngtcp2
 	find $(TARNAME)/deps/openssl -maxdepth 1 -type f ! -name 'nodejs-openssl.cnf' -exec $(RM) {} +

configure.py

@@ -399,6 +399,28 @@
     dest='shared_nbytes_libpath',
     help='a directory to search for the shared nbytes DLL')
 
+shared_optgroup.add_argument('--shared-ncrypto',
+    action='store_true',
+    dest='shared_ncrypto',
+    default=None,
+    help='link to a shared ncrypto DLL instead of static linking')
+
+shared_optgroup.add_argument('--shared-ncrypto-includes',
+    action='store',
+    dest='shared_ncrypto_includes',
+    help='directory containing ncrypto header files')
+
+shared_optgroup.add_argument('--shared-ncrypto-libname',
+    action='store',
+    dest='shared_ncrypto_libname',
+    default='ncrypto',
+    help='alternative lib name to link to [default: %(default)s]')
+
+shared_optgroup.add_argument('--shared-ncrypto-libpath',
+    action='store',
+    dest='shared_ncrypto_libpath',
+    help='a directory to search for the shared ncrypto DLL')
+
 shared_optgroup.add_argument('--shared-nghttp2',
     action='store_true',
     dest='shared_nghttp2',
@@ -2609,6 +2631,7 @@ def make_bin_override():
 configure_library('hdr_histogram', output)
 configure_library('merve', output)
 configure_library('nbytes', output)
+configure_library('ncrypto', output)
 configure_library('nghttp2', output, pkgname='libnghttp2')
 configure_library('nghttp3', output, pkgname='libnghttp3')
 configure_library('ngtcp2', output, pkgname='libngtcp2')

node.gyp

@@ -21,6 +21,7 @@
     'node_shared_lief%': 'false',
     'node_shared_merve%': 'false',
     'node_shared_nbytes%': 'false',
+    'node_shared_ncrypto%': 'false',
     'node_shared_nghttp2%': 'false',
     'node_shared_openssl%': 'false',
     'node_shared_sqlite%': 'false',
@@ -995,7 +996,12 @@
             'Ws2_32',
           ],
         }],
-        [ 'node_use_openssl=="true"', {
+        [ 'node_use_openssl=="true" and node_shared_ncrypto=="true"', {
+          'sources': [
+            '<@(node_crypto_sources)',
+          ],
+        }],
+        [ 'node_use_openssl=="true" and node_shared_ncrypto=="false"', {
           'sources': [
             '<@(node_crypto_sources)',
           ],
@@ -1308,11 +1314,13 @@
           'defines': [
             'HAVE_OPENSSL=1',
           ],
+        }, {
+          'sources!': [ '<@(node_cctest_openssl_sources)' ],
+        }],
+        [ 'node_use_openssl=="true" and node_shared_ncrypto=="false"', {
           'dependencies': [
             'deps/ncrypto/ncrypto.gyp:ncrypto',
           ],
-        }, {
-          'sources!': [ '<@(node_cctest_openssl_sources)' ],
         }],
         [ 'node_use_quic=="true"', {
           'defines': [
@@ -1598,13 +1606,15 @@
           ],
         }],
         [ 'node_use_openssl=="true"', {
-          'dependencies': [
-            'deps/ncrypto/ncrypto.gyp:ncrypto',
-          ],
           'defines': [
             'HAVE_OPENSSL=1',
           ],
         }],
+        [ 'node_use_openssl=="true" and node_shared_ncrypto=="false"', {
+          'dependencies': [
+            'deps/ncrypto/ncrypto.gyp:ncrypto',
+          ],
+        }],
         [ 'node_use_node_code_cache=="true"', {
           'defines': [
             'NODE_USE_NODE_CODE_CACHE=1',

tools/nix/ncrypto.nix

@@ -0,0 +1,59 @@
+{
+  lib,
+  cmake,
+  fetchFromGitHub,
+  fetchpatch2,
+  gtest,
+  openssl,
+  nix-update-script,
+  stdenv,
+  testers,
+  validatePkgConfig,
+  static ? stdenv.hostPlatform.isStatic,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ncrypto";
+  version = "1.0.2-unstable";
+
+  src = fetchFromGitHub {
+    owner = "nodejs";
+    repo = "ncrypto";
+    # tag = "v${finalAttrs.version}";
+    rev = "7e4a1bdeed104dd389b2744982712d24e49c3383";
+    hash = "sha256-Tq5BclGO38ZhT7v5vBaj3WeCkSUBIUx5QCDTUm9+aqo=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    validatePkgConfig
+  ];
+  buildInputs = [ openssl ];
+
+  doCheck = true;
+  checkInputs = [ gtest ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!static))
+    (lib.cmakeBool "NCRYPTO_SHARED_LIBS" true)
+    (lib.cmakeBool "NCRYPTO_TESTING" finalAttrs.finalPackage.doCheck)
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+
+    tests.pkg-config = testers.hasPkgConfigModules {
+      package = finalAttrs.finalPackage;
+      checkVersion = true;
+    };
+  };
+
+  meta = {
+    description = "Library of byte handling functions extracted from Node.js core";
+    homepage = "https://github.com/nodejs/ncrypto";
+    changelog = "https://github.com/nodejs/ncrypto/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aduh95 ];
+    platforms = lib.platforms.all;
+    pkgConfigModules = [ "ncrypto" ];
+  };
+})

tools/nix/sharedLibDeps.nix

@@ -65,8 +65,6 @@
       }${opensslSrc}" { })
       openssl_3_6
       ;
-  in
-  {
     openssl = openssl_3_6.overrideAttrs (old: {
       inherit version;
       src = pkgs.fetchurl {
@@ -84,6 +82,10 @@
         "dev"
       ];
     });
+  in
+  {
+    inherit openssl;
+    ncrypto = pkgs.callPackage ./ncrypto.nix { inherit openssl; };
   }
 ))
 // (pkgs.lib.optionalAttrs withTemporal {