-
Notifications
You must be signed in to change notification settings - Fork 158
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1505 from nichtsfrei/new_hash_method
Use pba authentication instead of authutils
- Loading branch information
Showing
7 changed files
with
235 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| build/ | ||
| tags | ||
| .ccls |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| #include "manage_authentication.h" | ||
| #include <gvm/util/passwordbasedauthentication.h> | ||
|
|
||
| #include <stdlib.h> | ||
| #include <string.h> | ||
|
|
||
| // prefer stack rather than heap so that we use the defaults on usage failure | ||
| // rather than having to check and fail. | ||
| struct PBASettings settings = {{0}, COUNT_DEFAULT, PREFIX_DEFAULT}; | ||
|
|
||
| /** | ||
| * @brief manage_authentication_setup sets the pepper, count and prefix used | ||
| * by the authentication implementation. | ||
| * | ||
| * When pepper is a NULL pointer, prefix is a NULL pointer or count is 0 then | ||
| * the previous setting of that setting will be kept. | ||
| * | ||
| * This is mainly to allow easier configuration within gvmd.c so that it can | ||
| * used parameterized without restore the same information there. | ||
| * | ||
| * The initial defaults are set to no-pepper, COUNT_DEFAULT and PREFIX_DEFAULT | ||
| * of gvm-libs. | ||
| * | ||
| * @param[in] pepper - a static hidden addition to the randomely generated salt | ||
| * @param[in] pepper_size - the size of pepper; it must not larger then | ||
| * MAX_PEPPER_SIZE | ||
| * @param[in] count - the amount of rounds used to calculate the hash; if 0 then | ||
| * COUNT_DEFAULT will be used | ||
| * @param[in] prefix - the used algorithm, if NULL pointer then the most secure | ||
| * available algorithm will be used. | ||
| * | ||
| * @return GMA_SUCCESS when the settings are set or GMA_ERR if there was a | ||
| * failure. | ||
| */ | ||
| enum manage_authentication_rc | ||
| manage_authentication_setup (const char *pepper, unsigned int pepper_size, | ||
| unsigned int count, char *prefix) | ||
| { | ||
| struct PBASettings *tmp = pba_init (pepper, pepper_size, count, prefix); | ||
| enum manage_authentication_rc rc = GMA_ERR; | ||
| unsigned int i; | ||
|
|
||
| if (tmp == NULL) | ||
| goto exit; | ||
| // only override pepper when pepper is initially set otherwise keep | ||
| // previous pepper | ||
| for (i = 0; pepper != NULL && i < MAX_PEPPER_SIZE; i++) | ||
| settings.pepper[i] = tmp->pepper[i]; | ||
| settings.count = count > 0 ? tmp->count : settings.count; | ||
| settings.prefix = prefix != NULL ? tmp->prefix : settings.prefix; | ||
| pba_finalize(tmp); | ||
| rc = GMA_SUCCESS; | ||
|
|
||
| exit: | ||
| return rc; | ||
| } | ||
|
|
||
| /** | ||
| * @brief creates a hash based on the settings set by | ||
| * manage_authentication_setup and the password. | ||
| * | ||
| * @param[in] password - the password to be hashed | ||
| * @return the hash or a NULL pointer on a failure. | ||
| * */ | ||
| char * | ||
| manage_authentication_hash (const char *password) | ||
| { | ||
| return pba_hash(&settings, password); | ||
| } | ||
|
|
||
| /** | ||
| * @brief manage_authentication_verify verifies given password with given hash. | ||
| * | ||
| * @param[in] password - the clear text password to be verified | ||
| * @param[in] hash - the stored hash to verify the password against. | ||
| * | ||
| * @return GMA_SUCCESS when password is valid, | ||
| * GMA_HASH_VALID_BUT_DATED when password is valid but a new hash | ||
| * should ne created and stored. | ||
| * GMA_HASH_INVALID when password is invalid | ||
| * GMA_ERR when an unexpected error occurs. | ||
| **/ | ||
| enum manage_authentication_rc | ||
| manage_authentication_verify (const char *hash, const char *password) | ||
| { | ||
| enum pba_rc pba_rc = pba_verify_hash(&settings, hash, password); | ||
| enum manage_authentication_rc rc; | ||
| switch (pba_rc){ | ||
| case VALID: | ||
| rc = GMA_SUCCESS; | ||
| break; | ||
| case INVALID: | ||
| rc = GMA_HASH_INVALID; | ||
| break; | ||
| case UPDATE_RECOMMENDED: | ||
| rc = GMA_HASH_VALID_BUT_DATED; | ||
| break; | ||
| default: | ||
| rc = GMA_ERR; | ||
| break; | ||
|
|
||
| } | ||
|
|
||
| return rc; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #ifndef _GVMD_MANAGE_AUTHENTICATION_H | ||
| #define _GVMD_MANAGE_AUTHENTICATION_H | ||
|
|
||
|
|
||
| enum manage_authentication_rc | ||
| { | ||
| GMA_SUCCESS, | ||
| GMA_HASH_VALID_BUT_DATED, | ||
| GMA_HASH_INVALID, | ||
| GMA_ERR, | ||
| }; | ||
|
|
||
| enum manage_authentication_rc | ||
| manage_authentication_setup (const char *pepper, unsigned int pepper_size, | ||
| unsigned int count, char *prefix); | ||
| char * | ||
| manage_authentication_hash (const char *password); | ||
|
|
||
| enum manage_authentication_rc | ||
| manage_authentication_verify (const char *hash, const char *password); | ||
|
|
||
| #endif | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters