summaryrefslogtreecommitdiff
path: root/sql/password.c
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2012-04-06 13:20:33 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2012-04-06 13:20:33 +0300
commit1d860ec51a3414259d349efba3dec68c295c79a2 (patch)
tree97d1e058259888c3045968fd40c0a37ea9f530cc /sql/password.c
parentea1b0492a081f335809e1cae6b9fd7738e00ea02 (diff)
parent7dcf0a66fdcd098fb6f8700712595bbaeb4e3cbf (diff)
downloadmariadb-git-1d860ec51a3414259d349efba3dec68c295c79a2.tar.gz
auto mere mysql-5.1-security->mysql-5.5-security
Diffstat (limited to 'sql/password.c')
-rw-r--r--sql/password.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/password.c b/sql/password.c
index ca194204360..0b989fa4df5 100644
--- a/sql/password.c
+++ b/sql/password.c
@@ -531,7 +531,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));
}