diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 12:01:52 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 12:01:52 +0200 |
commit | cbd52a42ee9b93675e5cdaa043df878c423b6571 (patch) | |
tree | f7159b893a8dc1d5efd540ef2b3b21227aaf2b6d /sql/password.c | |
parent | 70a3cafe4d1aa28e1b6c36d9001bc0d487262976 (diff) | |
parent | dea3544b2d9bd68961b8e84c3772deda435f15b5 (diff) | |
download | mariadb-git-cbd52a42ee9b93675e5cdaa043df878c423b6571.tar.gz |
merge
Diffstat (limited to 'sql/password.c')
-rw-r--r-- | sql/password.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/password.c b/sql/password.c index 64b3d69862d..0adbc0172d0 100644 --- a/sql/password.c +++ b/sql/password.c @@ -503,7 +503,7 @@ check_scramble(const uchar *scramble_arg, const char *message, mysql_sha1_reset(&sha1_context); mysql_sha1_input(&sha1_context, buf, SHA1_HASH_SIZE); mysql_sha1_result(&sha1_context, hash_stage2_reassured); - return memcmp(hash_stage2, hash_stage2_reassured, SHA1_HASH_SIZE); + return test(memcmp(hash_stage2, hash_stage2_reassured, SHA1_HASH_SIZE)); } |