Unverified Commit 3e752873 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #2278 from sfackler/alex-patch-2 

Raise bindgen version
parents 062b215a 8141d07a

.github/workflows/ci.yml

+1 −3
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

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

openssl-sys/Cargo.toml

+3 −2
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ readme = "README.md" 
categories = ["cryptography", "external-ffi-bindings"]

links = "openssl"

build = "build/main.rs"

edition = "2018"

edition = "2021"

rust-version = "1.63.0"



[features]

vendored = ['openssl-src']
@@ -23,7 +24,7 @@ libc = "0.2" 
bssl-sys = { version = "0.1.0", optional = true }



[build-dependencies]

bindgen = { version = "0.65.0", optional = true, features = ["experimental"] }

bindgen = { version = "0.69.0", optional = true, features = ["experimental"] }

cc = "1.0.61"

openssl-src = { version = "300.2.0", optional = true, features = ["legacy"] }

pkg-config = "0.3.9"

openssl/Cargo.toml

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ repository = "https://github.com/sfackler/rust-openssl" 
readme = "README.md"

keywords = ["crypto", "tls", "ssl", "dtls"]

categories = ["cryptography", "api-bindings"]

edition = "2018"

edition = "2021"

rust-version = "1.63.0"



# these are deprecated and don't do anything anymore

[features]