Move rustls-libssl/ to the repo root

rustls · Aug 29, 2024 · 26677f2 · 26677f2
1 parent 386cee6
commit 26677f2
Show file tree

Hide file tree

Showing 69 changed files with 61 additions and 75 deletions.
diff --git a/.github/workflows/libssl.yaml b/.github/workflows/libssl.yaml
@@ -10,10 +10,6 @@ on:
   schedule:
     - cron: '15 12 * * 3'
 
-defaults:
-  run:
-    working-directory: rustls-libssl
-
 jobs:
   build:
     name: Build+test
@@ -263,5 +259,5 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.package }} package built on ${{ matrix.container }} ${{ matrix.version }}
-          path: rustls-libssl/target/dist/*.${{ matrix.package }}
+          path: target/dist/*.${{ matrix.package }}
           if-no-files-found: error
diff --git a/rustls-libssl/Cargo.lock → Cargo.lock b/rustls-libssl/Cargo.lock → Cargo.lock
diff --git a/rustls-libssl/Cargo.toml → Cargo.toml b/rustls-libssl/Cargo.toml → Cargo.toml
diff --git a/rustls-libssl/LICENSE → LICENSE b/rustls-libssl/LICENSE → LICENSE
diff --git a/rustls-libssl/MATRIX.md → MATRIX.md b/rustls-libssl/MATRIX.md → MATRIX.md
diff --git a/rustls-libssl/Makefile → Makefile b/rustls-libssl/Makefile → Makefile
diff --git a/README.md b/README.md
@@ -1,10 +1,64 @@
-# rustls-openssl-compat
+<p align="center">
+  <img width="460" height="300" src="https://raw.githubusercontent.com/rustls/rustls/main/admin/rustls-logo-web.png">
+</p>
 
-This is the planned home of several rustls to OpenSSL compatibility layers.
-Currently here:
+rustls-libssl is a partial reimplementation of the OpenSSL 3 libssl ABI.
+It is written in rust and uses rustls.  It does not replace libcrypto:
+this is still required.
 
-- **[rustls-libssl](rustls-libssl/)**: an implementation of the OpenSSL libssl ABI in terms of rustls.
+[![rustls-libssl](https://github.com/rustls/rustls-openssl-compat/actions/workflows/libssl.yaml/badge.svg)](https://github.com/rustls/rustls-openssl-compat/actions/workflows/libssl.yaml)
 
-Not yet here:
+# Status
 
-- **rustls-libcrypto**: an implementation of rustls `CryptoProvider` in terms of OpenSSL's libcrypto.
+This project is experimental.  We have aimed for the subset of libssl
+used by:
+
+- curl on Ubuntu 22.04 LTS
+- nginx on Ubuntu 22.04 LTS and 24.04 LTS
+- nginx on Fedora 40
+
+We have a [compatibility matrix](MATRIX.md) and
+[known issues](https://github.com/rustls/rustls-openssl-compat/issues).
+
+# Usage
+
+## Installation
+Ubuntu/Debian users:
+
+```shell
+$ wget https://github.com/rustls/rustls-openssl-compat/releases/latest/download/rustls-libssl_amd64.deb
+$ sudo dpkg -i rustls-libssl_amd64.deb
+```
+
+or Fedora/Redhat users:
+
+```shell
+$ wget https://github.com/rustls/rustls-openssl-compat/releases/latest/download/rustls-libssl.x86_64.rpm
+$ sudo yum localinstall -y rustls-libssl.x86_64.rpm
+```
+
+Using curl:
+
+```shell
+$ with-rustls-libssl curl https://google.com/
+```
+
+`with-rustls-libssl` just sets `LD_LIBRARY_PATH` and executes the given process.
+
+Using nginx:
+
+```shell
+$ sudo rustls-libssl-nginx enable
+$ sudo systemctl daemon-reload
+$ sudo service nginx restart
+```
+
+`rustls-libssl-nginx enable` installs a systemd drop-in in `/etc/systemd/system/nginx.service.d/`.
+`rustls-libssl-nginx disable` undoes that.
+
+# Changelog
+The detailed list of changes in each release can be found at
+https://github.com/rustls/rustls-openssl-compat/releases.
+
+# License
+rustls-libssl is distributed under the Apache-2.0 license. See [LICENSE](LICENSE).
diff --git a/rustls-libssl/admin/format → admin/format b/rustls-libssl/admin/format → admin/format
diff --git a/rustls-libssl/admin/libssl.num → admin/libssl.num b/rustls-libssl/admin/libssl.num → admin/libssl.num
diff --git a/rustls-libssl/admin/matrix.py → admin/matrix.py b/rustls-libssl/admin/matrix.py → admin/matrix.py
diff --git a/rustls-libssl/admin/sort-entrypoints.py → admin/sort-entrypoints.py b/rustls-libssl/admin/sort-entrypoints.py → admin/sort-entrypoints.py
diff --git a/rustls-libssl/build.rs → build.rs b/rustls-libssl/build.rs → build.rs
diff --git a/rustls-libssl/dist/bin/rustls-libssl-nginx → dist/bin/rustls-libssl-nginx b/rustls-libssl/dist/bin/rustls-libssl-nginx → dist/bin/rustls-libssl-nginx
diff --git a/rustls-libssl/dist/bin/with-rustls-libssl → dist/bin/with-rustls-libssl b/rustls-libssl/dist/bin/with-rustls-libssl → dist/bin/with-rustls-libssl
diff --git a/rustls-libssl/dist/nfpm.yaml → dist/nfpm.yaml b/rustls-libssl/dist/nfpm.yaml → dist/nfpm.yaml
diff --git a/...s-libssl/dist/share/50-rustls-libssl.conf → dist/share/50-rustls-libssl.conf b/...s-libssl/dist/share/50-rustls-libssl.conf → dist/share/50-rustls-libssl.conf
diff --git a/...libssl/dist/test/deb-ubuntu-22/Dockerfile → dist/test/deb-ubuntu-22/Dockerfile b/...libssl/dist/test/deb-ubuntu-22/Dockerfile → dist/test/deb-ubuntu-22/Dockerfile
diff --git a/...libssl/dist/test/deb-ubuntu-22/nginx.conf → dist/test/deb-ubuntu-22/nginx.conf b/...libssl/dist/test/deb-ubuntu-22/nginx.conf → dist/test/deb-ubuntu-22/nginx.conf
diff --git a/...ibssl/dist/test/deb-ubuntu-22/run-test.sh → dist/test/deb-ubuntu-22/run-test.sh b/...ibssl/dist/test/deb-ubuntu-22/run-test.sh → dist/test/deb-ubuntu-22/run-test.sh
diff --git a/...libssl/dist/test/deb-ubuntu-24/Dockerfile → dist/test/deb-ubuntu-24/Dockerfile b/...libssl/dist/test/deb-ubuntu-24/Dockerfile → dist/test/deb-ubuntu-24/Dockerfile
diff --git a/...libssl/dist/test/rpm-fedora-40/Dockerfile → dist/test/rpm-fedora-40/Dockerfile b/...libssl/dist/test/rpm-fedora-40/Dockerfile → dist/test/rpm-fedora-40/Dockerfile
diff --git a/...libssl/dist/test/rpm-fedora-40/nginx.conf → dist/test/rpm-fedora-40/nginx.conf b/...libssl/dist/test/rpm-fedora-40/nginx.conf → dist/test/rpm-fedora-40/nginx.conf
diff --git a/rustls-libssl/README.md b/rustls-libssl/README.md
diff --git a/rustls-libssl/src/bio.rs → src/bio.rs b/rustls-libssl/src/bio.rs → src/bio.rs
diff --git a/rustls-libssl/src/cache.rs → src/cache.rs b/rustls-libssl/src/cache.rs → src/cache.rs
diff --git a/rustls-libssl/src/callbacks.rs → src/callbacks.rs b/rustls-libssl/src/callbacks.rs → src/callbacks.rs
diff --git a/rustls-libssl/src/conf.rs → src/conf.rs b/rustls-libssl/src/conf.rs → src/conf.rs
diff --git a/rustls-libssl/src/constants.rs → src/constants.rs b/rustls-libssl/src/constants.rs → src/constants.rs
diff --git a/rustls-libssl/src/entry.rs → src/entry.rs b/rustls-libssl/src/entry.rs → src/entry.rs
diff --git a/rustls-libssl/src/error.rs → src/error.rs b/rustls-libssl/src/error.rs → src/error.rs
diff --git a/rustls-libssl/src/evp_pkey.rs → src/evp_pkey.rs b/rustls-libssl/src/evp_pkey.rs → src/evp_pkey.rs
diff --git a/rustls-libssl/src/ex_data.rs → src/ex_data.rs b/rustls-libssl/src/ex_data.rs → src/ex_data.rs
diff --git a/rustls-libssl/src/ffi.rs → src/ffi.rs b/rustls-libssl/src/ffi.rs → src/ffi.rs
diff --git a/rustls-libssl/src/lib.rs → src/lib.rs b/rustls-libssl/src/lib.rs → src/lib.rs
diff --git a/rustls-libssl/src/miri.rs → src/miri.rs b/rustls-libssl/src/miri.rs → src/miri.rs
diff --git a/rustls-libssl/src/not_thread_safe.rs → src/not_thread_safe.rs b/rustls-libssl/src/not_thread_safe.rs → src/not_thread_safe.rs
diff --git a/rustls-libssl/src/sign.rs → src/sign.rs b/rustls-libssl/src/sign.rs → src/sign.rs
diff --git a/rustls-libssl/src/verifier.rs → src/verifier.rs b/rustls-libssl/src/verifier.rs → src/verifier.rs
diff --git a/rustls-libssl/src/x509.rs → src/x509.rs b/rustls-libssl/src/x509.rs → src/x509.rs
diff --git a/rustls-libssl/test-ca/ecdsa-p256/ca.cert → test-ca/ecdsa-p256/ca.cert b/rustls-libssl/test-ca/ecdsa-p256/ca.cert → test-ca/ecdsa-p256/ca.cert
diff --git a/rustls-libssl/test-ca/ecdsa-p256/server.cert → test-ca/ecdsa-p256/server.cert b/rustls-libssl/test-ca/ecdsa-p256/server.cert → test-ca/ecdsa-p256/server.cert
diff --git a/rustls-libssl/test-ca/ecdsa-p256/server.key → test-ca/ecdsa-p256/server.key b/rustls-libssl/test-ca/ecdsa-p256/server.key → test-ca/ecdsa-p256/server.key
diff --git a/rustls-libssl/test-ca/ecdsa-p384/ca.cert → test-ca/ecdsa-p384/ca.cert b/rustls-libssl/test-ca/ecdsa-p384/ca.cert → test-ca/ecdsa-p384/ca.cert
diff --git a/rustls-libssl/test-ca/ecdsa-p384/server.cert → test-ca/ecdsa-p384/server.cert b/rustls-libssl/test-ca/ecdsa-p384/server.cert → test-ca/ecdsa-p384/server.cert
diff --git a/rustls-libssl/test-ca/ecdsa-p384/server.key → test-ca/ecdsa-p384/server.key b/rustls-libssl/test-ca/ecdsa-p384/server.key → test-ca/ecdsa-p384/server.key
diff --git a/rustls-libssl/test-ca/ecdsa-p521/ca.cert → test-ca/ecdsa-p521/ca.cert b/rustls-libssl/test-ca/ecdsa-p521/ca.cert → test-ca/ecdsa-p521/ca.cert
diff --git a/rustls-libssl/test-ca/ecdsa-p521/server.cert → test-ca/ecdsa-p521/server.cert b/rustls-libssl/test-ca/ecdsa-p521/server.cert → test-ca/ecdsa-p521/server.cert
diff --git a/rustls-libssl/test-ca/ecdsa-p521/server.key → test-ca/ecdsa-p521/server.key b/rustls-libssl/test-ca/ecdsa-p521/server.key → test-ca/ecdsa-p521/server.key
diff --git a/rustls-libssl/test-ca/ed25519/ca.cert → test-ca/ed25519/ca.cert b/rustls-libssl/test-ca/ed25519/ca.cert → test-ca/ed25519/ca.cert
diff --git a/rustls-libssl/test-ca/ed25519/server.cert → test-ca/ed25519/server.cert b/rustls-libssl/test-ca/ed25519/server.cert → test-ca/ed25519/server.cert
diff --git a/rustls-libssl/test-ca/ed25519/server.key → test-ca/ed25519/server.key b/rustls-libssl/test-ca/ed25519/server.key → test-ca/ed25519/server.key
diff --git a/rustls-libssl/test-ca/rsa/ca.cert → test-ca/rsa/ca.cert b/rustls-libssl/test-ca/rsa/ca.cert → test-ca/rsa/ca.cert
diff --git a/rustls-libssl/test-ca/rsa/client.cert → test-ca/rsa/client.cert b/rustls-libssl/test-ca/rsa/client.cert → test-ca/rsa/client.cert
diff --git a/rustls-libssl/test-ca/rsa/client.key → test-ca/rsa/client.key b/rustls-libssl/test-ca/rsa/client.key → test-ca/rsa/client.key
diff --git a/rustls-libssl/test-ca/rsa/end.cert → test-ca/rsa/end.cert b/rustls-libssl/test-ca/rsa/end.cert → test-ca/rsa/end.cert
diff --git a/rustls-libssl/test-ca/rsa/end.key → test-ca/rsa/end.key b/rustls-libssl/test-ca/rsa/end.key → test-ca/rsa/end.key
diff --git a/rustls-libssl/test-ca/rsa/inter.cert → test-ca/rsa/inter.cert b/rustls-libssl/test-ca/rsa/inter.cert → test-ca/rsa/inter.cert
diff --git a/rustls-libssl/test-ca/rsa/server.cert → test-ca/rsa/server.cert b/rustls-libssl/test-ca/rsa/server.cert → test-ca/rsa/server.cert
diff --git a/rustls-libssl/test-ca/rsa/server.key → test-ca/rsa/server.key b/rustls-libssl/test-ca/rsa/server.key → test-ca/rsa/server.key
diff --git a/rustls-libssl/tests/ciphers.c → tests/ciphers.c b/rustls-libssl/tests/ciphers.c → tests/ciphers.c
diff --git a/rustls-libssl/tests/client.c → tests/client.c b/rustls-libssl/tests/client.c → tests/client.c
diff --git a/rustls-libssl/tests/config.c → tests/config.c b/rustls-libssl/tests/config.c → tests/config.c
diff --git a/rustls-libssl/tests/constants.c → tests/constants.c b/rustls-libssl/tests/constants.c → tests/constants.c
diff --git a/rustls-libssl/tests/helpers.h → tests/helpers.h b/rustls-libssl/tests/helpers.h → tests/helpers.h
diff --git a/rustls-libssl/tests/maybe-valgrind.sh → tests/maybe-valgrind.sh b/rustls-libssl/tests/maybe-valgrind.sh → tests/maybe-valgrind.sh
diff --git a/rustls-libssl/tests/nginx.conf → tests/nginx.conf b/rustls-libssl/tests/nginx.conf → tests/nginx.conf
diff --git a/rustls-libssl/tests/nginx_1_24.conf → tests/nginx_1_24.conf b/rustls-libssl/tests/nginx_1_24.conf → tests/nginx_1_24.conf
diff --git a/rustls-libssl/tests/runner.rs → tests/runner.rs b/rustls-libssl/tests/runner.rs → tests/runner.rs
diff --git a/rustls-libssl/tests/server.c → tests/server.c b/rustls-libssl/tests/server.c → tests/server.c