diff options
| -rw-r--r-- | sysif.c | 13 | ||||
| -rw-r--r-- | tests/018/crypt.tl | 3 | ||||
| -rw-r--r-- | txr.1 | 12 |
3 files changed, 24 insertions, 4 deletions
@@ -2081,9 +2081,18 @@ static val crypt_wrap(val wkey, val wsalt) free(key); free(salt); - /* libxcrypt puts out two possible failure tokens "*0" or "*1". + /* libraries cannot agree on how to report unrecognized or bad hashes: + * + * - older glibc versions, other libraries return null + * - libxcrypt, integrated into newer glibc puts out two + * possible failure tokens "*0" or "*1", documenting + * that an error token starts with "*" and is less than 13 + * characters long. + * - musl uses "*" and "x", the latter being in the valid hash charset! + * + * let's go with: null or less than 13 chars means error. */ - if (hash != 0 && strcmp(hash, "*0") != 0 && strcmp(hash, "*1") != 0) { + if (hash != 0 && memchr(hash, 0, 13) == 0) { val ret = string_utf8(hash); #if HAVE_CRYPT_R free(cd); diff --git a/tests/018/crypt.tl b/tests/018/crypt.tl index 33fd0ac5..7e68d6c7 100644 --- a/tests/018/crypt.tl +++ b/tests/018/crypt.tl @@ -11,8 +11,7 @@ (if (eq :linux (os-symbol)) (mtest (crypt "a" "b") :error - (crypt "a" "$0$") :error - (crypt "a" "$9$") :error + (crypt "a" "*$") :error (crypt "a" "$1$") "$1$$Ij31LCAysPM23KuPlm1wA/" (crypt "a" "$1$bcd$") "$1$bcd$cgz778Ks3pkbWfyW.CWae/" (crypt "a" "$5$") "$5$$QG6CCM7eJAxpUPcBpn0Z2K29NHtaI6Mk1fCpPrpjdj3" @@ -74768,6 +74768,18 @@ that buffer. Where available, the .code crypt_r function is used which avoids static storage. +Implementations of the C function vary in their error reporting. +Some implementations return a null pointer for invalid salts, +whereas others return valid "error token" strings which vary +between implementations. To work consistently across numerous +implementations, the \*(TL +.code crypt +function throws an +.code error +exception if the C library function returns either a null pointer, +or a valid pointer to a string that is less than 13 characters long, +regardless of its content. + .SS* Unix Signal Handling On platforms where certain advanced features of POSIX signal handling are |