aherman
/
proxysql
mirror of https://github.com/sysown/proxysql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed code deprecated in previous commit

Browse Source
v2.x-ssl3_warnings2
René Cannaò 3 years ago
parent a31f83473d
commit d8a7e99bc3
2 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File

29
lib/MySQL_Protocol.cpp
Unescape View File

@ -149,14 +149,6 @@ void proxy_compute_sha1_hash_multi(uint8_t *digest, const char *buf1, int len1,
unsigned int olen = 0;
EVP_DigestFinal(ctx, md, &olen);
EVP_MD_CTX_free(ctx);
#ifdef DEBUG // FIXME: remove this in future release
SHA_CTX sha1_context;
SHA1_Init(&sha1_context);
SHA1_Update(&sha1_context, buf1, len1);
SHA1_Update(&sha1_context, buf2, len2);
SHA1_Final(digest, &sha1_context);
assert(memcmp(md, digest, SHA_DIGEST_LENGTH)==0);
#endif
}
void proxy_compute_sha1_hash(uint8_t *digest, const char *buf, int len) {
@ -171,13 +163,6 @@ void proxy_compute_sha1_hash(uint8_t *digest, const char *buf, int len) {
unsigned int olen = 0;
EVP_DigestFinal(ctx, md, &olen);
EVP_MD_CTX_free(ctx);
#ifdef DEBUG // FIXME: remove this in future release
SHA_CTX sha1_context;
SHA1_Init(&sha1_context);
SHA1_Update(&sha1_context, buf, len);
SHA1_Final(digest, &sha1_context);
assert(memcmp(md, digest, SHA_DIGEST_LENGTH)==0);
#endif
}
void proxy_compute_two_stage_sha1_hash(const char *password, size_t pass_len, uint8_t *hash_stage1, uint8_t *hash_stage2) {
@ -2149,20 +2134,6 @@ __do_auth:
SHA1(pass,pass_len,md1_buf);
SHA1(md1_buf,SHA_DIGEST_LENGTH,md2_buf);
#ifdef DEBUG // FIXME: remove this in future release
uint8_t hash_stage1[SHA_DIGEST_LENGTH];
uint8_t hash_stage2[SHA_DIGEST_LENGTH];
SHA_CTX sha1_context;
SHA1_Init(&sha1_context);
SHA1_Update(&sha1_context, pass, pass_len);
SHA1_Final(hash_stage1, &sha1_context);
SHA1_Init(&sha1_context);
SHA1_Update(&sha1_context,hash_stage1,SHA_DIGEST_LENGTH);
SHA1_Final(hash_stage2, &sha1_context);
assert(memcmp(md1_buf,hash_stage1,SHA_DIGEST_LENGTH)==0);
assert(memcmp(md2_buf,hash_stage2,SHA_DIGEST_LENGTH)==0);
#endif
char *double_hashed_password = sha1_pass_hex((char *)md2_buf); // note that sha1_pass_hex() returns a new buffer
if (strcasecmp(double_hashed_password,password)==0) {

14
lib/ProxySQL_Admin.cpp
Unescape View File

@ -11146,20 +11146,6 @@ SQLite3_result* ProxySQL_Admin::__add_active_users(
SHA1((const unsigned char *)r->fields[1], strlen(r->fields[1]),md1_buf);
SHA1(md1_buf,SHA_DIGEST_LENGTH,md2_buf);
#ifdef DEBUG // FIXME: remove this in future release
uint8 hash_stage1[SHA_DIGEST_LENGTH];
uint8 hash_stage2[SHA_DIGEST_LENGTH];
SHA_CTX sha1_context;
SHA1_Init(&sha1_context);
SHA1_Update(&sha1_context, r->fields[1], strlen(r->fields[1]));
SHA1_Final(hash_stage1, &sha1_context);
SHA1_Init(&sha1_context);
SHA1_Update(&sha1_context,hash_stage1,SHA_DIGEST_LENGTH);
SHA1_Final(hash_stage2, &sha1_context);
assert(memcmp(md1_buf,hash_stage1,SHA_DIGEST_LENGTH)==0);
assert(memcmp(md2_buf,hash_stage2,SHA_DIGEST_LENGTH)==0);
#endif
password=sha1_pass_hex((char *)md2_buf); // note that sha1_pass_hex() returns a new buffer
}
} else {

Write Preview
Loading…
Cancel
Save