Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Start of SSL_CONF_* API support, Ubuntu 24.04 in CI #29

Merged
merged 3 commits into from
Jun 25, 2024
Merged

Start of SSL_CONF_* API support, Ubuntu 24.04 in CI #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bad401
start implementing SSL_CONF_* APIs
cpu Jun 21, 2024
c32e2ed
ci: add ubuntu-24.04 to CI
cpu Jun 21, 2024
496a821
tests: add nginx 1.24 specific tests
cpu Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/libssl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ jobs:
- stable
- beta
- nightly
os: [ubuntu-latest]
# TODO(XXX): consider replacing ubuntu-24.04 w/ ubuntu-latest when appropriate
os: [ubuntu-24.04, ubuntu-22.04]
steps:
- name: Checkout sources
uses: actions/checkout@v4
Expand Down
20 changes: 10 additions & 10 deletions rustls-libssl/MATRIX.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,17 @@
| `SSL_COMP_get_id` | | | |
| `SSL_COMP_get_name` | | | |
| `SSL_COMP_set0_compression_methods` | | | |
| `SSL_CONF_CTX_clear_flags` | | | |
| `SSL_CONF_CTX_finish` | | :white_check_mark: | :exclamation: [^stub] |
| `SSL_CONF_CTX_free` | | :white_check_mark: | :exclamation: [^stub] |
| `SSL_CONF_CTX_new` | | :white_check_mark: | :exclamation: [^stub] |
| `SSL_CONF_CTX_set1_prefix` | | | |
| `SSL_CONF_CTX_set_flags` | | :white_check_mark: | :exclamation: [^stub] |
| `SSL_CONF_CTX_set_ssl` | | | |
| `SSL_CONF_CTX_set_ssl_ctx` | | :white_check_mark: | :exclamation: [^stub] |
| `SSL_CONF_cmd` | | :white_check_mark: | :exclamation: [^stub] |
| `SSL_CONF_CTX_clear_flags` | | | :white_check_mark: |
| `SSL_CONF_CTX_finish` | | :white_check_mark: | :white_check_mark: |
| `SSL_CONF_CTX_free` | | :white_check_mark: | :white_check_mark: |
| `SSL_CONF_CTX_new` | | :white_check_mark: | :white_check_mark: |
| `SSL_CONF_CTX_set1_prefix` | | | :white_check_mark: |
| `SSL_CONF_CTX_set_flags` | | :white_check_mark: | :white_check_mark: |
| `SSL_CONF_CTX_set_ssl` | | | :white_check_mark: |
| `SSL_CONF_CTX_set_ssl_ctx` | | :white_check_mark: | :white_check_mark: |
| `SSL_CONF_cmd` | | :white_check_mark: | :white_check_mark: |
| `SSL_CONF_cmd_argv` | | | |
| `SSL_CONF_cmd_value_type` | | :white_check_mark: | :exclamation: [^stub] |
| `SSL_CONF_cmd_value_type` | | :white_check_mark: | :white_check_mark: |
| `SSL_CTX_SRP_CTX_free` [^deprecatedin_3_0] [^srp] | | | |
| `SSL_CTX_SRP_CTX_init` [^deprecatedin_3_0] [^srp] | | | |
| `SSL_CTX_add1_to_CA_list` | | | |
Expand Down
5 changes: 4 additions & 1 deletion rustls-libssl/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ifneq (,$(TARGET))
CARGOFLAGS += --target $(TARGET)
endif

all: target/ciphers target/client target/constants target/server target/$(PROFILE)/libssl.so.3
all: target/ciphers target/client target/config target/constants target/server target/$(PROFILE)/libssl.so.3

test: all
${CARGO} test $(CARGOFLAGS)
Expand All @@ -45,6 +45,9 @@ target/ciphers: target/ciphers.o
target/client: target/client.o
$(CC) -o $@ $^ $(LDFLAGS) $(shell pkg-config --libs openssl)

target/config: target/config.o
$(CC) -o $@ $^ $(LDFLAGS) $(shell pkg-config --libs openssl)

target/constants: target/constants.o
$(CC) -o $@ $^ $(LDFLAGS) $(shell pkg-config --libs openssl)

Expand Down
2 changes: 2 additions & 0 deletions rustls-libssl/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ const ENTRYPOINTS: &[&str] = &[
"SSL_CONF_CTX_finish",
"SSL_CONF_CTX_free",
"SSL_CONF_CTX_new",
"SSL_CONF_CTX_set1_prefix",
"SSL_CONF_CTX_set_flags",
"SSL_CONF_CTX_set_ssl",
"SSL_CONF_CTX_set_ssl_ctx",
"SSL_connect",
"SSL_ctrl",
Expand Down
Loading