Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PPH new functions #11

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

PPH new functions #11

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cff8952
added pph_delete_account function. Modified include/libpolypasswordh…
LolalyLuo Jul 11, 2016
8087e20
added pph_change_password function, however, for protector account, i…
LolalyLuo Jul 12, 2016
3491071
finishes pph_change_password and its test code :)
LolalyLuo Jul 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 54 additions & 1 deletion include/libpolypasswordhasher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ pph_context *pph_reload_context(const unsigned char *filename);
int PHS(void *out, size_t outlen, const void *in, size_t inlen,
const void* salt, size_t saltlen, int tcost, int mcost);

/*******************************************************************
/*******************************************************************
* NAME : pph_delete_account
*
* DESCRIPTION : Gaven the context and a username, the fuction will look into the
Expand Down Expand Up @@ -749,7 +749,60 @@ PPH_ERROR pph_delete_account(pph_context *ctx, const uint8 *username,
unsigned int username_length);


/*******************************************************************
* NAME : pph_change_password
*
* DESCRIPTION : Gaven the context a username and the new password, the fuction will look
* into the context and change the user's password. The application is responsible
* to make sure that the user is authenticated before having the ability to
* change password.
*
* INPUTS :
* PARAMETERS:
* pph_context *ctxt: This is the context in which the account will change password
*
* const unit8 *username: This is the desirerd user to be deleted
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

desired user whose password needs to be changed

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the catch!

*
* unsigned int username_length: The length of the username
*
* const unit8 *new_password: The new password as
*
* unsigned int new_password_length: The length of the new password
*
* OUTPUTS :
* PARAMETERS:
* None
*
* GLOBALS :
* None
*
* RETURN :
* Type: int PPH_ERROR
*
* Values: When:
* PPH_ERROR_OK The password is changed for user successfully
*
* PPH_BAD_PTR One of the fields is unallocated
*
* PPH_ERROR_UNKNOWN something unexpected happens
*
* PPH_CANT_FIND_USER The username doesn't exist
*
* PPH_USERNAME_IS_TOO_LONG The username_length is larger than MAX_USERNAME_LENGTH
*
* PPH_PASSWORD_IS_TOO_LONG The new_password_length is larger than MAX_PASSWORD_LENGTH
* PROCESS :
* 1) Sanitize data and report errors.
* 2) Go through the list to find the user, if not, report an error.
* 3) Change the password for diffrent type of users: protector, sheilded and bootstrap
* 4) Return
*
* CHANGES :
* This function is added in July 2016
*/

PPH_ERROR pph_change_password (pph_context *ctx, const uint8 *username, unsigned int username_length,
uint8 *new_password, unsigned int new_password_length);
// helper functions //////////////////////////


Expand Down
191 changes: 189 additions & 2 deletions src/libpolypasswordhasher.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1589,7 +1589,8 @@ PPH_ERROR pph_delete_account(pph_context *ctx, const uint8 *username,
before_search = ctx->account_data;
while(search != NULL ){
if (search->account.entries != NULL){
if (search->account.entries->share_number != SHIELDED_ACCOUNT){
if (search->account.entries->share_number != SHIELDED_ACCOUNT &&
search->account.entries->share_number != BOOTSTRAP_ACCOUNT){
share_count = share_count + search->account.number_of_entries;
}
}
Expand All @@ -1611,7 +1612,8 @@ PPH_ERROR pph_delete_account(pph_context *ctx, const uint8 *username,
//find out the number of shares the target account has,
//if deleting the target account would let shares be smaller than threshold, the we can't delete the account.
if (target->account.entries != NULL){
if (target->account.entries->share_number != SHIELDED_ACCOUNT) {
if (target->account.entries->share_number != SHIELDED_ACCOUNT &&
target->account.entries->share_number != BOOTSTRAP_ACCOUNT ) {
target_shares = target->account.number_of_entries;
} else {
target_shares = 0;
Expand Down Expand Up @@ -1645,6 +1647,191 @@ PPH_ERROR pph_delete_account(pph_context *ctx, const uint8 *username,
}


/*******************************************************************
* NAME : pph_change_password
*
* DESCRIPTION : Gaven the context a username and the new password, the fuction will look
* into the context and change the user's password. The application is responsible
* to make sure that the user is authenticated before having the ability to
* change password.
*
* INPUTS :
* PARAMETERS:
* pph_context *ctxt: This is the context in which the account will change password
*
* const unit8 *username: This is the desirerd user to be deleted
*
* unsigned int username_length: The length of the username
*
* const unit8 *new_password: The new password as
*
* unsigned int new_password_length: The length of the new password
*
* OUTPUTS :
* PARAMETERS:
* None
*
* GLOBALS :
* None
*
* RETURN :
* Type: int PPH_ERROR
*
* Values: When:
* PPH_ERROR_OK The password is changed for user successfully
*
* PPH_BAD_PTR One of the fields is unallocated
*
* PPH_ERROR_UNKNOWN something unexpected happens
*
* PPH_CANT_FIND_USER The username doesn't exist
*
* PPH_USERNAME_IS_TOO_LONG The username_length is larger than MAX_USERNAME_LENGTH
*
* PPH_PASSWORD_IS_TOO_LONG The new_password_length is larger than MAX_PASSWORD_LENGTH
*
* PPH_CONTEXT_IS_LOCKED Can't change password for protector account
* when the secret is unavailable
* PROCESS :
* 1) Sanitize data and report errors.
* 2) Go through the list to find the user, if not, report an error.
* 3) Change the password for diffrent type of users: protector, sheilded and bootstrap
* 4) Return
*
* CHANGES :
* This function is added in July 2016
*/

PPH_ERROR pph_change_password (pph_context *ctx, const uint8 *username, unsigned int username_length,
uint8 *new_password, unsigned int new_password_length){
pph_account_node *search;
pph_account_node *target = NULL;
pph_entry *entry_node, *old_entry_node, *last_entry, *temp_entry, *new_entry;
pph_bootstrap_entry *bootstrap_entry_target, *bootstrap_entry_search;
uint8 salt_buffer[MAX_SALT_LENGTH];
uint8 share_data[SHARE_LENGTH];
short sharenumber;
unsigned int i;
// 1) Sanitize data and report errors
//check for correct context pointer
if(ctx == NULL || username == NULL){
return PPH_BAD_PTR;
}

//check username length
if (username_length > MAX_USERNAME_LENGTH-1) {
return PPH_USERNAME_IS_TOO_LONG;
}

//check password length
if (new_password_length > MAX_PASSWORD_LENGTH-1) {
return PPH_PASSWORD_IS_TOO_LONG;
}

// 2) Go through the list to find the user, if not, report an error
//iterate through the context and find the node before the target.
search = ctx->account_data;
while(search != NULL){
if (username_length == search->account.username_length &&
!memcmp(search->account.username, username, username_length)){
target = search;
break;
}
search = search->next;
}

//if we can't find the user, return PPH_CANT_FIND_USER
if (target == NULL){
return PPH_CANT_FIND_USER;
}
// 3) Change the password for diffrent type of users: protector, sheilded and bootstrap
// for BOOTSTRAP_ACCOUNT
// it is ok to change password without the secret recoverd
if (target->account.entries->share_number == BOOTSTRAP_ACCOUNT) {
RAND_bytes(salt_buffer, MAX_SALT_LENGTH);
entry_node = create_bootstrap_entry(new_password, new_password_length,
salt_buffer, MAX_SALT_LENGTH);
old_entry_node = target->account.entries;
target->account.entries = entry_node;
//up to here, the password is already changed
//but we need to take care of bootstrap_entries in context
bootstrap_entry_target = NULL;
bootstrap_entry_search = ctx->bootstrap_entries;
while (bootstrap_entry_search != NULL){
if (bootstrap_entry_search->entry == old_entry_node) {
bootstrap_entry_target = bootstrap_entry_search;
break;
}
bootstrap_entry_search = bootstrap_entry_search->next;
}
if (bootstrap_entry_target == NULL){
return PPH_ERROR_UNKNOWN;
}
bootstrap_entry_target->entry = entry_node;
free(old_entry_node);
return PPH_ERROR_OK;

//for SHEILED_ACCOUNT
//if the secret is not available, we will change it into a BOOTSTRAP_ACCOUNT, then change password
}else if(target->account.entries->share_number == SHIELDED_ACCOUNT) {
RAND_bytes(salt_buffer, MAX_SALT_LENGTH);
if (ctx->is_normal_operation == false || ctx->AES_key == NULL){
entry_node = create_bootstrap_entry(new_password, new_password_length,
salt_buffer, MAX_SALT_LENGTH);
old_entry_node = target->account.entries;
target->account.entries = entry_node;
free(old_entry_node);
bootstrap_entry_target = malloc(sizeof(*bootstrap_entry_target));
bootstrap_entry_target->entry = entry_node;
if (ctx->bootstrap_entries == NULL) {
ctx->bootstrap_entries = bootstrap_entry_target;
bootstrap_entry_target->next = NULL;
} else {
bootstrap_entry_target->next = ctx->bootstrap_entries;
ctx->bootstrap_entries = bootstrap_entry_target;
}
return PPH_ERROR_OK;
//if the secret is available, it is ok to change the password
} else{
entry_node = create_shielded_entry(new_password, new_password_length, salt_buffer,
MAX_SALT_LENGTH, ctx->AES_key, DIGEST_LENGTH, ctx->isolated_check_bits);
old_entry_node = target->account.entries;
target->account.entries = entry_node;
free(old_entry_node);
return PPH_ERROR_OK;
}
//for protector account
//if the secret is not available, we can't change the secret at this time*/
}else {
if (ctx->is_normal_operation == false || ctx->AES_key == NULL){
return PPH_CONTEXT_IS_LOCKED;
//if the secret is available, we will reuse the shares and change password
} else{
old_entry_node = target->account.entries;
temp_entry = target->account.entries;
entry_node = NULL;
while (old_entry_node != NULL) {
gfshare_ctx_enc_getshare(ctx->share_context, old_entry_node->share_number, share_data);
RAND_bytes(salt_buffer, MAX_SALT_LENGTH);
new_entry = create_protector_entry(new_password, new_password_length, salt_buffer,
MAX_SALT_LENGTH, share_data, SHARE_LENGTH, ctx->isolated_check_bits);
if (entry_node == NULL){
entry_node = new_entry;
last_entry = new_entry;
}else {
last_entry->next = new_entry;
last_entry = last_entry->next;
}
old_entry_node = old_entry_node->next;
free(temp_entry);
temp_entry = old_entry_node;
}
target->account.entries = entry_node;
return PPH_ERROR_OK;
}
}
}



// helper functions ///////////////////////
Expand Down
Loading