Skip to content

libcrypt-util: use build-time check for crypt_preferred_method #17163

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

Jump to bottom
Merged
poettering merged 1 commit into from
Sep 28, 2020
Merged

libcrypt-util: use build-time check for crypt_preferred_method #17163

poettering merged 1 commit into from
Sep 28, 2020

Conversation

@bluca
Copy link
Member

@bluca bluca commented Sep 25, 2020

After #16981 only the presence of crypt_gensalt_ra
is checked, but there are cases where that function is available but crypt_preferred_method
is not, and they are used in the same ifdef.
Add a check for the latter as well.

@bluca bluca mentioned this pull request Sep 25, 2020
Merged
@keszybz
Copy link
Member

keszybz commented Sep 25, 2020

LGTM.

@keszybz keszybz added good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed meson labels Sep 25, 2020
@poettering
Copy link
Member

poettering commented Sep 25, 2020

Duplicate of #17158. Also see my comments there. I think the ifdeffery should cover less ground..

@poettering poettering added reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks and removed good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed labels Sep 25, 2020
@bluca
libcrypt-util: use build-time check for crypt_preferred_method
69ffcc3 
After systemd#16981 only the presence of crypt_gensalt_ra
is checked, but there are cases where that function is available but crypt_preferred_method
is not, and they are used in the same ifdef.
Add a check for the latter as well.
@bluca bluca force-pushed the libcrypto_build_regression branch from edd2bfa to 69ffcc3 Compare September 25, 2020 14:02
@bluca
Copy link
Member Author

bluca commented Sep 25, 2020

Duplicate of #17158. Also see my comments there. I think the ifdeffery should cover less ground..

Updated, ptal

@poettering poettering added good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed and removed reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks labels Sep 25, 2020
@poettering poettering mentioned this pull request Sep 25, 2020
Closed
@bluca
Copy link
Member Author

bluca commented Sep 26, 2020

bionic-i386 timed out as usual and bionic-amd64 failed in the path-unit test, again as it commonly happens. Neither seem related.

@poettering poettering merged commit feee7f6 into systemd:master Sep 28, 2020
@bluca bluca deleted the libcrypto_build_regression branch September 28, 2020 08:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed meson

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@bluca @keszybz @poettering