Merge remote-tracking branch 'upstream/master' into support-xof-squeeze (cc16063a) · Commits · Public Repositories / Rust Openssl

.github/workflows/ci.yml

+18 −12

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ jobs:
		# Remember to also update `--rust-target` in `openssl-sys/build/run_bindgen.rs`
		- uses: sfackler/actions/rustup@master
		with:
		version: 1.56.0
		version: 1.63.0
		- run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT
		id: rust-version
		- uses: actions/cache@v4
		@@ -72,8 +72,6 @@ jobs:
		restore-keys: \|
		index-${{ runner.os }}-
		- run: cargo generate-lockfile
		- run: \|
		cargo update -p cc --precise 1.0.94
		- uses: actions/cache@v4
		with:
		path: ~/.cargo/registry/cache
		@@ -155,22 +153,26 @@ jobs:
		version: e23fe9b6eecc10e4f9ea1f0027fea5eaee7bd6b6
		- name: openssl
		version: vendored
		- name: openssl
		version: 3.4.0-beta1
		- name: openssl
		version: 3.3.0
		- name: openssl
		version: 3.2.0
		dl-path: /
		- name: openssl
		old: true
		version: 1.1.1w
		dl-path: /
		- name: openssl
		version: 1.1.0l
		old: true
		dl-path: /old/1.1.0
		- name: openssl
		version: 1.0.2u
		old: true
		dl-path: /old/1.0.2
		- name: openssl
		version: 1.0.1u
		old: true
		dl-path: /old/1.0.1
		include:
		- target: x86_64-unknown-linux-gnu
		@@ -182,17 +184,17 @@ jobs:
		bindgen: true
		library:
		name: libressl
		version: 3.7.3
		version: 3.8.4
		- target: x86_64-unknown-linux-gnu
		bindgen: true
		library:
		name: libressl
		version: 3.8.3
		version: 3.9.2
		- target: x86_64-unknown-linux-gnu
		bindgen: true
		library:
		name: libressl
		version: 3.9.1
		version: 4.0.0
		- target: x86_64-unknown-linux-gnu
		bindgen: false
		library:
		@@ -202,17 +204,17 @@ jobs:
		bindgen: false
		library:
		name: libressl
		version: 3.7.3
		version: 3.8.4
		- target: x86_64-unknown-linux-gnu
		bindgen: false
		library:
		name: libressl
		version: 3.8.3
		version: 3.9.2
		- target: x86_64-unknown-linux-gnu
		bindgen: false
		library:
		name: libressl
		version: 3.9.1
		version: 4.0.0
		name: ${{ matrix.target }}-${{ matrix.library.name }}-${{ matrix.library.version }}-${{ matrix.bindgen }}
		runs-on: ubuntu-latest
		env:
		@@ -257,7 +259,11 @@ jobs:
		run: \|
		case "${{ matrix.library.name }}" in
		"openssl")
		if [[ "${{ matrix.library.old }}" == "true" ]]; then
		url="https://www.openssl.org/source${{ matrix.library.dl-path }}/openssl-${{ matrix.library.version }}.tar.gz"
		else
		url="https://github.com/openssl/openssl/releases/download/openssl-${{ matrix.library.version }}/openssl-${{ matrix.library.version }}.tar.gz"
		fi
		tar_flags="--strip-components=1"
		;;
		"libressl")

.rustfmt.toml

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		# this project uses the default rustfmt settings

Cargo.toml

+1 −0

Original line number	Diff line number	Diff line
		[workspace]
		resolver = "2"
		members = [
		"openssl",
		"openssl-errors",

openssl-errors/Cargo.toml

+2 −1

Original line number	Diff line number	Diff line
		@@ -2,12 +2,13 @@
		name = "openssl-errors"
		version = "0.2.0"
		authors = ["Steven Fackler <sfackler@gmail.com>"]
		edition = "2018"
		edition = "2021"
		license = "MIT OR Apache-2.0"
		description = "Custom error library support for the openssl crate."
		repository = "https://github.com/sfackler/rust-openssl"
		readme = "README.md"
		categories = ["api-bindings"]
		rust-version = "1.63.0"

		[dependencies]
		cfg-if = "1.0"

openssl-macros/Cargo.toml

+2 −1

Original line number	Diff line number	Diff line
		[package]
		name = "openssl-macros"
		version = "0.1.1"
		edition = "2018"
		edition = "2021"
		license = "MIT OR Apache-2.0"
		description = "Internal macros used by the openssl crate."
		repository = "https://github.com/sfackler/rust-openssl"
		rust-version = "1.63.0"

		[lib]
		proc-macro = true