diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-05-21 22:00:08 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-05-21 22:00:08 +0300 |
| commit | 3143ad589a24ac7581e2195ba0dc13576cb3c9da (patch) | |
| tree | 9c02baa18cdca6f60d80e2f7ee7f3f792c293ab9 /plugin/feedback | |
| parent | 068c61978e3a81836d52b8caf11e044290159ad1 (diff) | |
| download | mariadb-git-3143ad589a24ac7581e2195ba0dc13576cb3c9da.tar.gz | |
Push a lot of small fixes to get larger parts to compile
Diffstat (limited to 'plugin/feedback')
| -rw-r--r-- | plugin/feedback/utils.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/plugin/feedback/utils.cc b/plugin/feedback/utils.cc index f7f962deaca..c0227cf1292 100644 --- a/plugin/feedback/utils.cc +++ b/plugin/feedback/utils.cc @@ -389,7 +389,6 @@ int calculate_server_uid(char *dest) { uchar rawbuf[2 + 6]; uchar shabuf[SHA1_HASH_SIZE]; - SHA1_CONTEXT ctx; int2store(rawbuf, mysqld_port); if (my_gethwaddr(rawbuf + 2)) @@ -398,9 +397,7 @@ int calculate_server_uid(char *dest) return 1; } - mysql_sha1_reset(&ctx); - mysql_sha1_input(&ctx, rawbuf, sizeof(rawbuf)); - mysql_sha1_result(&ctx, shabuf); + compute_sha1_hash((uint8*) shabuf, (char*) rawbuf, sizeof(rawbuf)); assert(base64_needed_encoded_length(sizeof(shabuf)) <= SERVER_UID_SIZE); base64_encode(shabuf, sizeof(shabuf), dest); |