Use unsigned char in _crypt_extended_r

Avoid signed shift UB.

diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
index 068d743d1a92c37eafe76fb9d76fb7af4a0f2424..d0b1e6a5a7f1ca0d9d7654655315e2d932f5378b 100644 (file)
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@ -179,7 +179,7 @@ PHPAPI zend_string *php_crypt(const char *password, const int pass_len, const ch
                        memset(&buffer, 0, sizeof(buffer));
                        _crypt_extended_init_r();
 
-                       crypt_res = _crypt_extended_r(password, salt, &buffer);
+                       crypt_res = _crypt_extended_r((const unsigned char *) password, salt, &buffer);
                        if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) {
                                return NULL;
                        } else {

diff --git a/ext/standard/crypt_freesec.c b/ext/standard/crypt_freesec.c
index dc51b30150875f74869b41bd619fa827a298d938..572e5127b16721a82436dcdfae068735b9f4406e 100644 (file)
--- a/ext/standard/crypt_freesec.c
+++ b/ext/standard/crypt_freesec.c
@@ -607,7 +607,7 @@ des_cipher(const char *in, char *out, uint32_t salt, int count,
 }
 
 char *
-_crypt_extended_r(const char *key, const char *setting,
+_crypt_extended_r(const unsigned char *key, const char *setting,
        struct php_crypt_extended_data *data)
 {
        int             i;

diff --git a/ext/standard/crypt_freesec.h b/ext/standard/crypt_freesec.h
index c102736783a69cdfe9f52ea34863108d698479b9..69271f23a725573fe0ce1a4a00c620a379d7710b 100644 (file)
--- a/ext/standard/crypt_freesec.h
+++ b/ext/standard/crypt_freesec.h
@@ -28,7 +28,7 @@ struct php_crypt_extended_data {
 
 void _crypt_extended_init(void);
 
-char *_crypt_extended_r(const char *key, const char *setting,
+char *_crypt_extended_r(const unsigned char *key, const char *setting,
        struct php_crypt_extended_data *data);
 
 #endif