Make sure we use SHA1 and not SHA0. fixes compiling error when SHA0 is disabled in openssl.

This commit is contained in:
John Törnblom 2012-09-04 10:47:24 +02:00
parent 4b9630c9c9
commit d779f2e6ca

View file

@ -210,11 +210,11 @@ access_get_hashed(const char *username, const uint8_t digest[20],
if(superuser_username != NULL && superuser_password != NULL) {
SHA_Init(&shactx);
SHA_Update(&shactx, (const uint8_t *)superuser_password,
strlen(superuser_password));
SHA_Update(&shactx, challenge, 32);
SHA_Final(d, &shactx);
SHA1_Init(&shactx);
SHA1_Update(&shactx, (const uint8_t *)superuser_password,
strlen(superuser_password));
SHA1_Update(&shactx, challenge, 32);
SHA1_Final(d, &shactx);
if(!strcmp(superuser_username, username) && !memcmp(d, digest, 20))
return 0xffffffff;
@ -229,9 +229,9 @@ access_get_hashed(const char *username, const uint8_t digest[20],
if((b & ae->ae_netmask) != ae->ae_network)
continue; /* IP based access mismatches */
SHA_Init(&shactx);
SHA_Update(&shactx, (const uint8_t *)ae->ae_password,
strlen(ae->ae_password));
SHA1_Init(&shactx);
SHA1_Update(&shactx, (const uint8_t *)ae->ae_password,
strlen(ae->ae_password));
SHA1_Update(&shactx, challenge, 32);
SHA1_Final(d, &shactx);