diff options
author | Chad MILLER <chad@mysql.com> | 2009-03-12 13:32:13 -0400 |
---|---|---|
committer | Chad MILLER <chad@mysql.com> | 2009-03-12 13:32:13 -0400 |
commit | 8725bcd94402800ac2d87f94dfecd5a202d80497 (patch) | |
tree | b1f4bd6f14f3d63baf2c6957bce2b7c78da87b64 /client | |
parent | 6b72857803d50d1090e6fa514b0ddee81234fab7 (diff) | |
parent | b756503262f5211d01b8d1013b29b20c1c908906 (diff) | |
download | mariadb-git-8725bcd94402800ac2d87f94dfecd5a202d80497.tar.gz |
Merge bug fix and upstream.
Diffstat (limited to 'client')
-rw-r--r-- | client/mysqlmanager-pwgen.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/client/mysqlmanager-pwgen.c b/client/mysqlmanager-pwgen.c index 7a857c59743..568358b1cda 100644 --- a/client/mysqlmanager-pwgen.c +++ b/client/mysqlmanager-pwgen.c @@ -134,7 +134,6 @@ void get_pass(char* pw, int len) int main(int argc, char** argv) { FILE* fp; - my_MD5_CTX context; uchar digest[16]; char pw[17]; uint i; @@ -147,9 +146,7 @@ int main(int argc, char** argv) if (!(fp=fopen(outfile,"w"))) die("Could not open '%s'(errno=%d)",outfile,errno); get_pass(pw,sizeof(pw)-1); - my_MD5Init(&context); - my_MD5Update(&context,(uchar*) pw,sizeof(pw)-1); - my_MD5Final(digest,&context); + MY_MD5_HASH(digest,(uchar*) pw,sizeof(pw)-1); fprintf(fp,"%s:",user); for (i=0;i<sizeof(digest);i++) fprintf(fp,"%02x",digest[i]); |