# HG changeset patch # User Igor Sysoev # Date 1192537031 0 # Node ID 6a60502db714e3ea225082f8e459f3d4f3c9ea4f # Parent 8f911d6d0d707837742035276caffcd417618cb1 use ngx_sha1.h diff --git a/src/mysql/ngx_mysql.c b/src/mysql/ngx_mysql.c --- a/src/mysql/ngx_mysql.c +++ b/src/mysql/ngx_mysql.c @@ -12,12 +12,7 @@ #include #include #include - -#if (NGX_HAVE_OPENSSL_SHA1_H) -#include -#else -#include -#endif +#include #define NGX_MYSQL_LONG_PASSWORD 0x0001 @@ -142,7 +137,7 @@ ngx_mysql_read_server_greeting(ngx_event ngx_mysql_greeting1_pkt_t *gr1; ngx_mysql_greeting2_pkt_t *gr2; ngx_mysql_auth_pkt_t *auth; - SHA_CTX sha; + ngx_sha1_t sha; u_char hash1[20], hash2[20]; c = rev->data; @@ -241,19 +236,19 @@ ngx_mysql_read_server_greeting(ngx_event *p++ = (u_char) 20; - SHA1_Init(&sha); - SHA1_Update(&sha, m->passwd->data, m->passwd->len); - SHA1_Final(hash1, &sha); + ngx_sha1_init(&sha); + ngx_sha1_update(&sha, m->passwd->data, m->passwd->len); + ngx_sha1_final(hash1, &sha); - SHA1_Init(&sha); - SHA1_Update(&sha, hash1, 20); - SHA1_Final(hash2, &sha); + ngx_sha1_init(&sha); + ngx_sha1_update(&sha, hash1, 20); + ngx_sha1_final(hash2, &sha); - SHA1_Init(&sha); - SHA1_Update(&sha, gr2->salt1, 8); - SHA1_Update(&sha, gr2->salt2, 12); - SHA1_Update(&sha, hash2, 20); - SHA1_Final(hash2, &sha); + ngx_sha1_init(&sha); + ngx_sha1_update(&sha, gr2->salt1, 8); + ngx_sha1_update(&sha, gr2->salt2, 12); + ngx_sha1_update(&sha, hash2, 20); + ngx_sha1_final(hash2, &sha); for (i = 0; i < 20; i++) { *p++ = (u_char) (hash1[i] ^ hash2[i]);