Unverified Commit 5332b2b4 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #213168 from LeSuisse/rustls-ffi-init 

rustls-ffi: init at 0.9.2 and make possible to build Apache mod_tls with it
parents 89a498aa ce5b2e37

pkgs/development/libraries/rustls-ffi/Cargo.lock

0 → 100644
+351 −0
Original line number Diff line number Diff line 
# This file is automatically @generated by Cargo.

# It is not intended for manual editing.

version = 3



[[package]]

name = "autocfg"

version = "1.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"



[[package]]

name = "base64"

version = "0.13.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"



[[package]]

name = "bumpalo"

version = "3.12.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"



[[package]]

name = "cc"

version = "1.0.79"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"



[[package]]

name = "cfg-if"

version = "1.0.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"



[[package]]

name = "hashbrown"

version = "0.12.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"



[[package]]

name = "indexmap"

version = "1.9.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"

dependencies = [

 "autocfg",

 "hashbrown",

]



[[package]]

name = "js-sys"

version = "0.3.61"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"

dependencies = [

 "wasm-bindgen",

]



[[package]]

name = "libc"

version = "0.2.140"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"



[[package]]

name = "log"

version = "0.4.17"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"

dependencies = [

 "cfg-if",

]



[[package]]

name = "memchr"

version = "2.5.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"



[[package]]

name = "num_enum"

version = "0.5.11"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"

dependencies = [

 "num_enum_derive",

]



[[package]]

name = "num_enum_derive"

version = "0.5.11"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"

dependencies = [

 "proc-macro-crate",

 "proc-macro2",

 "quote",

 "syn",

]



[[package]]

name = "once_cell"

version = "1.17.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"



[[package]]

name = "proc-macro-crate"

version = "1.3.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"

dependencies = [

 "once_cell",

 "toml_edit",

]



[[package]]

name = "proc-macro2"

version = "1.0.53"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73"

dependencies = [

 "unicode-ident",

]



[[package]]

name = "quote"

version = "1.0.26"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"

dependencies = [

 "proc-macro2",

]



[[package]]

name = "ring"

version = "0.16.20"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"

dependencies = [

 "cc",

 "libc",

 "once_cell",

 "spin",

 "untrusted",

 "web-sys",

 "winapi",

]



[[package]]

name = "rustls"

version = "0.20.8"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"

dependencies = [

 "log",

 "ring",

 "rustversion",

 "sct",

 "webpki",

]



[[package]]

name = "rustls-ffi"

version = "0.9.2"

dependencies = [

 "libc",

 "log",

 "num_enum",

 "rustls",

 "rustls-pemfile",

 "sct",

 "webpki",

]



[[package]]

name = "rustls-pemfile"

version = "0.2.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9"

dependencies = [

 "base64",

]



[[package]]

name = "rustversion"

version = "1.0.12"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"



[[package]]

name = "sct"

version = "0.7.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"

dependencies = [

 "ring",

 "untrusted",

]



[[package]]

name = "spin"

version = "0.5.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"



[[package]]

name = "syn"

version = "1.0.109"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"

dependencies = [

 "proc-macro2",

 "quote",

 "unicode-ident",

]



[[package]]

name = "toml_datetime"

version = "0.6.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"



[[package]]

name = "toml_edit"

version = "0.19.8"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"

dependencies = [

 "indexmap",

 "toml_datetime",

 "winnow",

]



[[package]]

name = "unicode-ident"

version = "1.0.8"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"



[[package]]

name = "untrusted"

version = "0.7.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"



[[package]]

name = "wasm-bindgen"

version = "0.2.84"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"

dependencies = [

 "cfg-if",

 "wasm-bindgen-macro",

]



[[package]]

name = "wasm-bindgen-backend"

version = "0.2.84"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"

dependencies = [

 "bumpalo",

 "log",

 "once_cell",

 "proc-macro2",

 "quote",

 "syn",

 "wasm-bindgen-shared",

]



[[package]]

name = "wasm-bindgen-macro"

version = "0.2.84"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"

dependencies = [

 "quote",

 "wasm-bindgen-macro-support",

]



[[package]]

name = "wasm-bindgen-macro-support"

version = "0.2.84"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"

dependencies = [

 "proc-macro2",

 "quote",

 "syn",

 "wasm-bindgen-backend",

 "wasm-bindgen-shared",

]



[[package]]

name = "wasm-bindgen-shared"

version = "0.2.84"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"



[[package]]

name = "web-sys"

version = "0.3.61"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"

dependencies = [

 "js-sys",

 "wasm-bindgen",

]



[[package]]

name = "webpki"

version = "0.22.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"

dependencies = [

 "ring",

 "untrusted",

]



[[package]]

name = "winapi"

version = "0.3.9"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"

dependencies = [

 "winapi-i686-pc-windows-gnu",

 "winapi-x86_64-pc-windows-gnu",

]



[[package]]

name = "winapi-i686-pc-windows-gnu"

version = "0.4.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"



[[package]]

name = "winapi-x86_64-pc-windows-gnu"

version = "0.4.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"



[[package]]

name = "winnow"

version = "0.4.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"

dependencies = [

 "memchr",

]

pkgs/development/libraries/rustls-ffi/default.nix

0 → 100644
+39 −0
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, apacheHttpd }:



rustPlatform.buildRustPackage rec {

  pname = "rustls-ffi";

  version = "0.9.2";



  src = fetchFromGitHub {

    owner = "rustls";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-urDC/Tm+ZwEbf0orZzKSET5ljQGVcKPGxscctKOM/FU=";

  };



  propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Security ];



  cargoLock.lockFile = ./Cargo.lock;

  postPatch = ''

    cp ${./Cargo.lock} Cargo.lock

  '';



  installPhase = ''

    runHook preInstall



    make install DESTDIR=${placeholder "out"}



    runHook postInstall

  '';



  passthru.tests = {

    apacheHttpd = apacheHttpd.override { modTlsSupport = true; };

  };



  meta = with lib; {

    description = "C-to-rustls bindings";

    homepage = "https://github.com/rustls/rustls-ffi/";

    license = with lib.licenses; [ mit asl20 isc ];

    maintainers = [ maintainers.lesuisse ];

  };

}

pkgs/servers/http/apache-httpd/2.4.nix

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
, nixosTests

, proxySupport ? true

, sslSupport ? true, openssl

, modTlsSupport ? false, rustls-ffi, Foundation

, http2Support ? true, nghttp2

, ldapSupport ? true, openldap

, libxml2Support ? true, libxml2
@@ -27,6 +28,8 @@ stdenv.mkDerivation rec { 
  buildInputs = [ perl libxcrypt ] ++

    lib.optional brotliSupport brotli ++

    lib.optional sslSupport openssl ++

    lib.optional modTlsSupport rustls-ffi ++

    lib.optional (modTlsSupport && stdenv.isDarwin) Foundation ++

    lib.optional ldapSupport openldap ++    # there is no --with-ldap flag

    lib.optional libxml2Support libxml2 ++

    lib.optional http2Support nghttp2 ++
@@ -55,6 +58,7 @@ stdenv.mkDerivation rec { 
    "--includedir=${placeholder "dev"}/include"

    (lib.enableFeature proxySupport "proxy")

    (lib.enableFeature sslSupport "ssl")

    (lib.enableFeature modTlsSupport "tls")

    (lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2")

    "--docdir=$(doc)/share/doc"

pkgs/top-level/all-packages.nix

+7 −1
Original line number Diff line number Diff line
@@ -23409,6 +23409,10 @@ with pkgs; 














  rustc-demangle = callPackage ../development/libraries/rustc-demangle { };



























  rustls-ffi = callPackage ../development/libraries/rustls-ffi {













    inherit (darwin.apple_sdk.frameworks) Security;













  };



























  s2geometry = callPackage ../development/libraries/s2geometry { };





























  /*  This package references ghc844, which we no longer have. Unfortunately, I










@@ -24581,7 +24585,9 @@ with pkgs;



























  apache-directory-server = callPackage ../servers/ldap/apache-directory-server { };



























  apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { };













  apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix {













    inherit (darwin.apple_sdk.frameworks) Foundation;













  };















  apacheHttpd = apacheHttpd_2_4;





























  apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in {