summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
2aac9fd)
Changed the encoding hash to use the OpenSSL function instead
of the generic version
-/* convert the hashed binary password to hexadecimal representation and
- free the hashed binary password */
-void to_hexadecimal (char *hex, unsigned char *binary_pwd, unsigned int len)
+/* encode the binary data to readable text format using OpenSSL */
+void encode_binary (char *encoded, unsigned char *binary_data, unsigned int len)
- char buf[3];
- /* keep reference to beginning of the hashed password */
- unsigned char *binary_pw_begin = binary_pwd;
- for (int i = 0; i < len; i ++)
- {
- sprintf (buf, "%02x", (*binary_pwd)&0xff);
- strcat (hex, buf);
- binary_pwd ++;
- }
- /* free the hashed password */
- OPENSSL_free (binary_pw_begin);
+
+ EVP_EncodeBlock ((unsigned char*)encoded,
+ (const unsigned char*)binary_data, len);
+ OPENSSL_free (binary_data);
}
/* get a number from the user */
}
/* get a number from the user */
digest_message ((const unsigned char *)password, strlen(password),
&hashed_sol_password, &len);
char hashed_hex_pwd[256] = { (char) NULL };
digest_message ((const unsigned char *)password, strlen(password),
&hashed_sol_password, &len);
char hashed_hex_pwd[256] = { (char) NULL };
- to_hexadecimal (hashed_hex_pwd, hashed_sol_password, len);
+ encode_binary (hashed_hex_pwd, hashed_sol_password, len);
if (strcmp (p->hashed_solution_password, hashed_hex_pwd) == 0)
return true;
if (strcmp (p->hashed_solution_password, hashed_hex_pwd) == 0)
return true;
digest_message ((const unsigned char *)password, strlen(password),
&hashed_mas_password, &len);
char hashed_hex_pwd[256] = { (char) NULL };
digest_message ((const unsigned char *)password, strlen(password),
&hashed_mas_password, &len);
char hashed_hex_pwd[256] = { (char) NULL };
- to_hexadecimal (hashed_hex_pwd, hashed_mas_password, len);
+ encode_binary (hashed_hex_pwd, hashed_mas_password, len);
if (strcmp (p->hashed_master_password, hashed_hex_pwd) == 0)
return true;
if (strcmp (p->hashed_master_password, hashed_hex_pwd) == 0)
return true;
/* the hashedpwd contains binary data - we will convert it to
hexadecimal data and store in file */
/* the hashedpwd contains binary data - we will convert it to
hexadecimal data and store in file */
- to_hexadecimal (p->hashed_solution_password, hashedpwd, len);
+ encode_binary (p->hashed_solution_password, hashedpwd, len);
/* the hashedpwd contains binary data - we will convert it to
hexadecimal data and store in file */
/* the hashedpwd contains binary data - we will convert it to
hexadecimal data and store in file */
- to_hexadecimal (p->hashed_master_password, hashedpwd, len);
+ encode_binary (p->hashed_master_password, hashedpwd, len);