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 some deprecated patterns when using BoringSSL #1945

Merged
merged 1 commit into from
Jun 4, 2023

Conversation

davidben
Copy link
Contributor

@davidben davidben commented Jun 3, 2023

The RSA and DSA changes will be needed to avoid build breakage soon. The others are mostly tidying up. There's another place around BIO that we'd ideally also switch over, but that depends on resolving the __fixed_rust mess first.

This addresses a symptom of #1944, but not the root cause.

(@maurer FYI. Android will need to pick this patch up to avoid causing another problem with BoringSSL updates.)

@davidben
Copy link
Contributor Author

davidben commented Jun 3, 2023

CI failures are odd. They are with BoringSSL, but I'm also confused how they could be caused by this PR:

error: ambiguous glob re-exports
  --> openssl-sys/src/lib.rs:17:9
   |
17 | pub use libc::*;
   |         ^^^^^^^ the name `FILE` in the type namespace is first re-exported here
...
36 | pub use boringssl::*;
   |         ------------ but the name `FILE` in the type namespace is also re-exported here
   |
   = note: `-D ambiguous-glob-reexports` implied by `-D warnings`

error: ambiguous glob re-exports
  --> openssl-sys/src/lib.rs:17:9
   |
17 | pub use libc::*;
   |         ^^^^^^^ the name `timeval` in the type namespace is first re-exported here
...
36 | pub use boringssl::*;
   |         ------------ but the name `timeval` in the type namespace is also re-exported here

error: ambiguous glob re-exports
  --> openssl-sys/src/lib.rs:17:9
   |
17 | pub use libc::*;
   |         ^^^^^^^ the name `tm` in the type namespace is first re-exported here
...
36 | pub use boringssl::*;
   |         ------------ but the name `tm` in the type namespace is also re-exported here

error: ambiguous glob re-exports
  --> openssl-sys/src/lib.rs:17:9
   |
17 | pub use libc::*;
   |         ^^^^^^^ the name `time_t` in the type namespace is first re-exported here
...
36 | pub use boringssl::*;
   |         ------------ but the name `time_t` in the type namespace is also re-exported here

Is there perhaps an issue with bindgen over-binding things?

@davidben
Copy link
Contributor Author

davidben commented Jun 3, 2023

I see a similar failure in #1946, so guessing this is not related to this PR and rather the CI broke.

The RSA and DSA changes will be needed to avoid build breakage soon. The
others are mostly tidying up. There's another place around BIO that we'd
ideally also switch over, but that depends on resolving the
__fixed_rust mess first.

This addresses a symptom of sfackler#1944, but not the root cause.
@alex alex merged commit d5cc54b into sfackler:master Jun 4, 2023
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.

2 participants