diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-04-07 15:58:46 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-07 15:58:46 +0200 |
commit | f860b2aad41cd1b5ed0438ea211dcd78eec82b94 (patch) | |
tree | 650133297bec368a1cdeb50ea1950e1b4d1b679e /sql/password.c | |
parent | b43494620f6cd57e8249940f4fb0406ffff8dff7 (diff) | |
parent | b95ae56b9f47cc19d3498d4be3142b2449a04600 (diff) | |
download | mariadb-git-f860b2aad41cd1b5ed0438ea211dcd78eec82b94.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 f4ff3156bec..1a12a81f7c6 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)); } |