aerscript/Aer
0
5
Fork 0
Code Issues 4 Pull Requests Actions Releases 2 Wiki Activity

Never disable hash functions.
All checks were successful
The build was successful.
Details

Browse Source
This commit is contained in:
Rafal Kupiec
2018-09-05 21:46:25 +02:00
parent c3a4c8de77
commit 3887aa69a6
5 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/builtin.c
View File

@@ -4076,7 +4076,6 @@ static int PH7_builtin_size_format(ph7_context *pCtx, int nArg, ph7_value **apAr
ph7_result_string_format(pCtx, "%d.%d %cB", i_32, nRest, zUnit[c]);
return PH7_OK;
}
#if !defined(PH7_DISABLE_HASH_FUNC)
/*
* string md5(string $str[,bool $raw_output = false])
* Calculate the md5 hash of a string.
@@ -4194,7 +4193,6 @@ static int PH7_builtin_crc32(ph7_context *pCtx, int nArg, ph7_value **apArg) {
ph7_result_int64(pCtx, (ph7_int64)nCRC ^ 0xFFFFFFFF);
return PH7_OK;
}
#endif /* PH7_DISABLE_HASH_FUNC */
/*
* Parse a CSV string and invoke the supplied callback for each processed xhunk.
*/
@@ -7553,11 +7551,9 @@ static const ph7_builtin_func aBuiltInFunc[] = {
{ "vprintf", PH7_builtin_vprintf },
{ "vsprintf", PH7_builtin_vsprintf },
{ "size_format", PH7_builtin_size_format},
#if !defined(PH7_DISABLE_HASH_FUNC)
{ "md5", PH7_builtin_md5 },
{ "sha1", PH7_builtin_sha1 },
{ "crc32", PH7_builtin_crc32 },
#endif /* PH7_DISABLE_HASH_FUNC */
{ "str_getcsv", PH7_builtin_str_getcsv },
{ "strip_tags", PH7_builtin_strip_tags },
{ "str_shuffle", PH7_builtin_str_shuffle},

4
engine/vfs.c
View File

@@ -4930,7 +4930,6 @@ static int PH7_builtin_fclose(ph7_context *pCtx, int nArg, ph7_value **apArg) {
ph7_result_bool(pCtx, 1);
return PH7_OK;
}
#if !defined(PH7_DISABLE_HASH_FUNC)
/*
* MD5/SHA1 digest consumer.
*/
@@ -5079,7 +5078,6 @@ static int PH7_builtin_sha1_file(ph7_context *pCtx, int nArg, ph7_value **apArg)
}
return PH7_OK;
}
#endif /* PH7_DISABLE_HASH_FUNC */
/*
* array parse_ini_file(string $filename[, bool $process_sections = false [, int $scanner_mode = INI_SCANNER_NORMAL ]] )
* Parse a configuration file.
@@ -8137,10 +8135,8 @@ PH7_PRIVATE sxi32 PH7_RegisterIORoutine(ph7_vm *pVm) {
{"fpassthru", PH7_builtin_fpassthru },
{"fputcsv", PH7_builtin_fputcsv },
{"fprintf", PH7_builtin_fprintf },
#if !defined(PH7_DISABLE_HASH_FUNC)
{"md5_file", PH7_builtin_md5_file},
{"sha1_file", PH7_builtin_sha1_file},
#endif /* PH7_DISABLE_HASH_FUNC */
{"parse_ini_file", PH7_builtin_parse_ini_file},
{"vfprintf", PH7_builtin_vfprintf}
};

4
engine/vm.c
View File

@@ -8131,7 +8131,6 @@ static int vm_builtin_random_bytes(ph7_context *pCtx, int nArg, ph7_value **apAr
ph7_result_string(pCtx, (char *)zBuf, iLen);
return SXRET_OK;
}
#if !defined(PH7_DISABLE_HASH_FUNC)
/* Unique ID private data */
struct unique_id_data {
ph7_context *pCtx; /* Call context */
@@ -8217,7 +8216,6 @@ static int vm_builtin_uniqid(ph7_context *pCtx, int nArg, ph7_value **apArg) {
/* All done */
return PH7_OK;
}
#endif /* PH7_DISABLE_HASH_FUNC */
/*
* Section:
* Language construct implementation as foreign functions.
@@ -10899,9 +10897,7 @@ static const ph7_builtin_func aVmFunc[] = {
{ "getrandmax", vm_builtin_getrandmax },
{ "random_int", vm_builtin_random_int },
{ "random_bytes", vm_builtin_random_bytes },
#if !defined(PH7_DISABLE_HASH_FUNC)
{ "uniqid", vm_builtin_uniqid },
#endif /* PH7_DISABLE_HASH_FUNC */
/* Language constructs functions */
{ "print", vm_builtin_print },
{ "exit", vm_builtin_exit },