Fix a few external crypt() issues on musl #16702
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Among other things, this test tries to run too few and too many rounds
of SHA256. In both cases, it is expecting an error, but that behavior
depends on the implementation:
* PHP's own implementation raises an error in either case
* libxcrypt raises an error in either case
* Older versions of glibc would clamp the number of rounds
to a valid amount (newer versions don't have libcrypt)
* Musl libc clamps values that are too low, but raises an error
for values that are too high
If PHP is built with --with-external-libcrypt, the musl implementation
above can be used. Even if libxcrypt is installed, PHP will notice
that no additional -lfoo flags are needed to use the crypt
implementation in musl. To pass on such a system, we must not test
for the "too few rounds" behavior.
Musl's crypt() implementation of DES tries to handle invalid salts and can make this test fail because it returns an answer and not an error. Even musl however will reject a salt with a ':' in it, so we can make this test cross-platform by supplying an even less valid salt.
|
@arnaud-lb may be interested in this :) |
nielsdos
reviewed
Nov 5, 2024
ext/standard/crypt.c
Outdated
| @@ -215,6 +215,17 @@ PHP_FUNCTION(crypt) | |||
| RETURN_STRING("*0"); | |||
| } | |||
| } | |||
| else if (zend_string_equals_literal(result, "*")) { | |||
There was a problem hiding this comment.
This should be fixed in the php_crypt function itself.
Musl's crypt() returns "*" to indicate failure in contrast with the "*0" returned by PHP/libxcrypt. This causes test failures, but more importantly, is a pretty silly thing to expect the user to know. This commit catches the musl value and turns it into "*0".
arnaud-lb
added a commit
that referenced
this pull request
Nov 7, 2024
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Using
--with-external-libcrypton a musl system (even if libxcrypt is installed) will use thecrypt()implementation from musl. There are a few incompatibilities to work around before the test suite will pass on a such a system.