mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 15:25:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: generalize my_sha1.cc

Browse source 
move most of the code into my_sha.ic, making it independent
from the actual SHAx variant.
This commit is contained in:
Sergei Golubchik 2017-03-06 12:45:36 +01:00
commit bd1139ad27
6 changed files with 219 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugin/feedback/utils.cc
View file

@ -20,7 +20,6 @@
#endif
#include <base64.h>
#include <sha1.h>
#if defined (_WIN32)
#define HAVE_SYS_UTSNAME_H
@ -420,7 +419,7 @@ int fill_collation_statistics(THD *thd, TABLE_LIST *tables)
int calculate_server_uid(char *dest)
{
uchar rawbuf[2 + 6];
uchar shabuf[SHA1_HASH_SIZE];
uchar shabuf[MY_SHA1_HASH_SIZE];
int2store(rawbuf, mysqld_port);
if (my_gethwaddr(rawbuf + 2))
@ -429,7 +428,7 @@ int calculate_server_uid(char *dest)
return 1;
}
compute_sha1_hash((uint8*) shabuf, (char*) rawbuf, sizeof(rawbuf));
my_sha1((uint8*) shabuf, (char*) rawbuf, sizeof(rawbuf));
assert(base64_needed_encoded_length(sizeof(shabuf)) <= SERVER_UID_SIZE);
base64_encode(shabuf, sizeof(shabuf), dest);