diff options
| author | Jakub Skopal <riffraff@php.net> | 1999-09-06 13:24:36 +0000 |
|---|---|---|
| committer | Jakub Skopal <riffraff@php.net> | 1999-09-06 13:24:36 +0000 |
| commit | a38995a832dc34f9f89a0aeb9f5d5715888edde2 (patch) | |
| tree | b6738022107a241fa740b58d9665c15c4bb9a86e | |
| parent | 93252bd556ecca2f0daba41ef6e3a994c041a36c (diff) | |
| download | php-git-a38995a832dc34f9f89a0aeb9f5d5715888edde2.tar.gz | |
Workaround for crypt() getting too few characters for salt.
| -rw-r--r-- | ext/standard/crypt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c index 1c0b301ca8..aa71099382 100644 --- a/ext/standard/crypt.c +++ b/ext/standard/crypt.c @@ -122,7 +122,10 @@ PHP_FUNCTION(crypt) char salt[PHP3_MAX_SALT_LEN+1]; pval *arg1, *arg2; - salt[0]='\0'; + salt[0]=salt[PHP3_MAX_SALT_LEN]='\0'; + /* This will produce suitable results if people depend on DES-encryption + available (passing always 2-character salt). At least for glibc6.1 */ + memset(&salt[1], '$', PHP3_MAX_SALT_LEN-1); switch (ARG_COUNT(ht)) { case 1: |