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.

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

Fix clippy warnings produced by newer Rust #2052

Merged
merged 3 commits into from
Oct 12, 2023
Merged

Conversation

wiktor-k
Copy link
Contributor

@wiktor-k wiktor-k commented Oct 10, 2023

🤔

The ambiguous_glob_reexports now complains about reexport of hostent in openssl-sys/src/lib.rs (as pub use libc::* and pub use openssl::*):

libc::*; | ^^^^^^^ the name `hostent` in the type namespace is first re-exported here

I'll see if I can somehow resolve it cleanly.

@wiktor-k wiktor-k marked this pull request as ready for review October 10, 2023 12:01
@wiktor-k wiktor-k force-pushed the fix-clippy branch 6 times, most recently from d7deee4 to d54c254 Compare October 10, 2023 12:36
@sfackler
Copy link
Owner

I'm assuming the hostent lints are coming from the bindgen builds. We should probably be excluding that from the codegen and pulling from libc explicitly?

@wiktor-k
Copy link
Contributor Author

I'm assuming the hostent lints are coming from the bindgen builds. We should probably be excluding that from the codegen and pulling from libc explicitly?

Yep. That was a good lead, thank you!

(For the record local cargo test --features bindgen showed these warnings.)

@alex alex merged commit 9e79073 into sfackler:master Oct 12, 2023
59 checks passed
@wiktor-k wiktor-k deleted the fix-clippy branch October 13, 2023 09:48
bors referenced this pull request in rust-lang/cargo Nov 28, 2023
…, r=weihanglo

chore(deps): update rust crate openssl to 0.10.60 [security]

[![Mend Renovate logo banner](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [openssl](https://github.com/sfackler/rust-openssl) | workspace.dependencies | patch | `0.10.57` -> `0.10.60` |

### GitHub Vulnerability Alerts

#### [GHSA-xphf-cx8h-7q9g](https://github.com/sfackler/rust-openssl/issues/2096)

This function returned a reference into an OpenSSL datastructure, but there was no way to ensure OpenSSL would not mutate the datastructure behind one's back.

Use of this function should be replaced with `X509StoreRef::all_certificates`.

---

### Release Notes

<details>
<summary>sfackler/rust-openssl (openssl)</summary>

### [`v0.10.60`](https://github.com/sfackler/rust-openssl/releases/tag/openssl-v0.10.60)

[Compare Source](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.59...openssl-v0.10.60)

#### What's Changed

-   Correct off-by-one in minimum output buffer size computation by [`@&#8203;alex](https://github.com/alex)` in [https://github.com/sfackler/rust-openssl/pull/2088](https://github.com/sfackler/rust-openssl/pull/2088)
-   Expose a few more (bad) ciphers in cipher::Cipher by [`@&#8203;alex](https://github.com/alex)` in [https://github.com/sfackler/rust-openssl/pull/2084](https://github.com/sfackler/rust-openssl/pull/2084)
-   add temp key bindings by [`@&#8203;jmayclin](https://github.com/jmayclin)` in [https://github.com/sfackler/rust-openssl/pull/2076](https://github.com/sfackler/rust-openssl/pull/2076)
-   Expose ChaCha20 on LibreSSL by [`@&#8203;alex](https://github.com/alex)` in [https://github.com/sfackler/rust-openssl/pull/2093](https://github.com/sfackler/rust-openssl/pull/2093)
-   Revert "Correct off-by-one in minimum output buffer size computation" by [`@&#8203;alex](https://github.com/alex)` in [https://github.com/sfackler/rust-openssl/pull/2090](https://github.com/sfackler/rust-openssl/pull/2090)
-   Added `update_unchecked` to `symm::Crypter` by [`@&#8203;alex](https://github.com/alex)` in [https://github.com/sfackler/rust-openssl/pull/2100](https://github.com/sfackler/rust-openssl/pull/2100)
-   fixes [#&#8203;2096](https://github.com/sfackler/rust-openssl/issues/2096) -- deprecate `X509StoreRef::objects`, it is unsound by [`@&#8203;alex](https://github.com/alex)` in [https://github.com/sfackler/rust-openssl/pull/2099](https://github.com/sfackler/rust-openssl/pull/2099)
-   Don't leak when overwriting ex data by [`@&#8203;sfackler](https://github.com/sfackler)` in [https://github.com/sfackler/rust-openssl/pull/2102](https://github.com/sfackler/rust-openssl/pull/2102)
-   Release openssl v0.10.60 and openssl-sys v0.9.96 by [`@&#8203;alex](https://github.com/alex)` in [https://github.com/sfackler/rust-openssl/pull/2104](https://github.com/sfackler/rust-openssl/pull/2104)

**Full Changelog**: sfackler/rust-openssl@openssl-v0.10.59...openssl-v0.10.60

### [`v0.10.59`](https://github.com/sfackler/rust-openssl/releases/tag/openssl-v0.10.59)

[Compare Source](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.58...openssl-v0.10.59)

#### What's Changed

-   Add binding to NID of Chacha20-Poly1305 cipher by [`@&#8203;Arnavion](https://github.com/Arnavion)` in [https://github.com/sfackler/rust-openssl/pull/2081](https://github.com/sfackler/rust-openssl/pull/2081)
-   Fixed cfg for RSA_PSS by [`@&#8203;alex](https://github.com/alex)` in [https://github.com/sfackler/rust-openssl/pull/2079](https://github.com/sfackler/rust-openssl/pull/2079)
-   fixes [#&#8203;2050](https://github.com/sfackler/rust-openssl/issues/2050) -- build and test on libressl 3.8.2 by [`@&#8203;alex](https://github.com/alex)` in [https://github.com/sfackler/rust-openssl/pull/2082](https://github.com/sfackler/rust-openssl/pull/2082)
-   Release openssl v0.10.59 and openssl-sys v0.9.95 by [`@&#8203;alex](https://github.com/alex)` in [https://github.com/sfackler/rust-openssl/pull/2083](https://github.com/sfackler/rust-openssl/pull/2083)

#### New Contributors

-   [`@&#8203;Arnavion](https://github.com/Arnavion)` made their first contribution in [https://github.com/sfackler/rust-openssl/pull/2081](https://github.com/sfackler/rust-openssl/pull/2081)

**Full Changelog**: sfackler/rust-openssl@openssl-v0.10.58...openssl-v0.10.59

### [`v0.10.58`](https://github.com/sfackler/rust-openssl/releases/tag/openssl-v0.10.58)

[Compare Source](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.57...openssl-v0.10.58)

#### What's Changed

-   LibreSSL 3.8.1 support by [`@&#8203;alex](https://github.com/alex)` in [https://github.com/sfackler/rust-openssl/pull/2035](https://github.com/sfackler/rust-openssl/pull/2035)
-   Update vendored version to openssl 3 by [`@&#8203;amousset](https://github.com/amousset)` in [https://github.com/sfackler/rust-openssl/pull/1925](https://github.com/sfackler/rust-openssl/pull/1925)
-   Test against 3.2.0-alpha1 by [`@&#8203;sfackler](https://github.com/sfackler)` in [https://github.com/sfackler/rust-openssl/pull/2037](https://github.com/sfackler/rust-openssl/pull/2037)
-   Removed reference to non-existent method by [`@&#8203;alex](https://github.com/alex)` in [https://github.com/sfackler/rust-openssl/pull/2039](https://github.com/sfackler/rust-openssl/pull/2039)
-   Bump CI to 1.1.1w by [`@&#8203;sfackler](https://github.com/sfackler)` in [https://github.com/sfackler/rust-openssl/pull/2040](https://github.com/sfackler/rust-openssl/pull/2040)
-   \[openssl-sys] Add X509\_check\_{host,email,ip,ip_asc} fns by [`@&#8203;jgallagher](https://github.com/jgallagher)` in [https://github.com/sfackler/rust-openssl/pull/2042](https://github.com/sfackler/rust-openssl/pull/2042)
-   Expose CBC mode for several more (bad) ciphers by [`@&#8203;alex](https://github.com/alex)` in [https://github.com/sfackler/rust-openssl/pull/2045](https://github.com/sfackler/rust-openssl/pull/2045)
-   Expose two additional Pkey IDs by [`@&#8203;alex](https://github.com/alex)` in [https://github.com/sfackler/rust-openssl/pull/2046](https://github.com/sfackler/rust-openssl/pull/2046)
-   Add support for CRL extensions and the Authority Information Access e… by [`@&#8203;AdmiralGT](https://github.com/AdmiralGT)` in [https://github.com/sfackler/rust-openssl/pull/2003](https://github.com/sfackler/rust-openssl/pull/2003)
-   Fix clippy warnings produced by newer Rust by [`@&#8203;wiktor-k](https://github.com/wiktor-k)` in [https://github.com/sfackler/rust-openssl/pull/2052](https://github.com/sfackler/rust-openssl/pull/2052)
-   Use osslconf on BoringSSL by [`@&#8203;alex](https://github.com/alex)` in [https://github.com/sfackler/rust-openssl/pull/2056](https://github.com/sfackler/rust-openssl/pull/2056)
-   Make X509\_ALGOR opaque for LibreSSL by [`@&#8203;botovq](https://github.com/botovq)` in [https://github.com/sfackler/rust-openssl/pull/2060](https://github.com/sfackler/rust-openssl/pull/2060)
-   Don't ignore ECDSA tests without GF2m support by [`@&#8203;botovq](https://github.com/botovq)` in [https://github.com/sfackler/rust-openssl/pull/2061](https://github.com/sfackler/rust-openssl/pull/2061)
-   Clarify 'possible LibreSSL bug' by [`@&#8203;botovq](https://github.com/botovq)` in [https://github.com/sfackler/rust-openssl/pull/2062](https://github.com/sfackler/rust-openssl/pull/2062)
-   Enable BN_mod_sqrt() for upcoming LibreSSL 3.8.2 by [`@&#8203;botovq](https://github.com/botovq)` in [https://github.com/sfackler/rust-openssl/pull/2063](https://github.com/sfackler/rust-openssl/pull/2063)
-   Enable SHA-3 for LibreSSL 3.8.0 by [`@&#8203;botovq](https://github.com/botovq)` in [https://github.com/sfackler/rust-openssl/pull/2064](https://github.com/sfackler/rust-openssl/pull/2064)
-   Remove DH_generate_parameters for LibreSSL 3.8.2 by [`@&#8203;botovq](https://github.com/botovq)` in [https://github.com/sfackler/rust-openssl/pull/2065](https://github.com/sfackler/rust-openssl/pull/2065)
-   Use EVP_MD_CTX\_{new,free}() in LibreSSL 3.8.2 by [`@&#8203;botovq](https://github.com/botovq)` in [https://github.com/sfackler/rust-openssl/pull/2067](https://github.com/sfackler/rust-openssl/pull/2067)
-   Enable HKDF support for LibreSSL >= 3.6.0 by [`@&#8203;botovq](https://github.com/botovq)` in [https://github.com/sfackler/rust-openssl/pull/2066](https://github.com/sfackler/rust-openssl/pull/2066)
-   Two build script fixes for LibreSSL by [`@&#8203;botovq](https://github.com/botovq)` in [https://github.com/sfackler/rust-openssl/pull/2068](https://github.com/sfackler/rust-openssl/pull/2068)
-   Respect OPENSSL_NO_OCB on AES functions by [`@&#8203;GuyLewin](https://github.com/GuyLewin)` in [https://github.com/sfackler/rust-openssl/pull/2070](https://github.com/sfackler/rust-openssl/pull/2070)
-   Support OPENSSL_NO_SCRYPT by [`@&#8203;GuyLewin](https://github.com/GuyLewin)` in [https://github.com/sfackler/rust-openssl/pull/2071](https://github.com/sfackler/rust-openssl/pull/2071)
-   Bump 3.2.0 beta by [`@&#8203;sfackler](https://github.com/sfackler)` in [https://github.com/sfackler/rust-openssl/pull/2073](https://github.com/sfackler/rust-openssl/pull/2073)
-   add security level bindings by [`@&#8203;jmayclin](https://github.com/jmayclin)` in [https://github.com/sfackler/rust-openssl/pull/2074](https://github.com/sfackler/rust-openssl/pull/2074)
-   Release openssl v0.10.58 and openssl-sys v0.9.94 by [`@&#8203;alex](https://github.com/alex)` in [https://github.com/sfackler/rust-openssl/pull/2078](https://github.com/sfackler/rust-openssl/pull/2078)

#### New Contributors

-   [`@&#8203;amousset](https://github.com/amousset)` made their first contribution in [https://github.com/sfackler/rust-openssl/pull/1925](https://github.com/sfackler/rust-openssl/pull/1925)
-   [`@&#8203;jgallagher](https://github.com/jgallagher)` made their first contribution in [https://github.com/sfackler/rust-openssl/pull/2042](https://github.com/sfackler/rust-openssl/pull/2042)
-   [`@&#8203;AdmiralGT](https://github.com/AdmiralGT)` made their first contribution in [https://github.com/sfackler/rust-openssl/pull/2003](https://github.com/sfackler/rust-openssl/pull/2003)
-   [`@&#8203;botovq](https://github.com/botovq)` made their first contribution in [https://github.com/sfackler/rust-openssl/pull/2060](https://github.com/sfackler/rust-openssl/pull/2060)
-   [`@&#8203;GuyLewin](https://github.com/GuyLewin)` made their first contribution in [https://github.com/sfackler/rust-openssl/pull/2070](https://github.com/sfackler/rust-openssl/pull/2070)
-   [`@&#8203;jmayclin](https://github.com/jmayclin)` made their first contribution in [https://github.com/sfackler/rust-openssl/pull/2074](https://github.com/sfackler/rust-openssl/pull/2074)

**Full Changelog**: sfackler/rust-openssl@openssl-v0.10.57...openssl-v0.10.58

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "" (UTC), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/rust-lang/cargo).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy41OS44IiwidXBkYXRlZEluVmVyIjoiMzcuNTkuOCIsInRhcmdldEJyYW5jaCI6Im1hc3RlciJ9-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants