Merge branch 'master' into '6-delete-luks-key-endpoint'
# Conflicts: # src/cryptops-api.c
No related branches found
No related tags found
Showing
- Makefile 10 additions, 6 deletionsMakefile
- src/api/encryption_get.c 1 addition, 1 deletionsrc/api/encryption_get.c
- src/api/encryption_init_post.c 83 additions, 57 deletionssrc/api/encryption_init_post.c
- src/api/encryption_keys_get.c 2 additions, 1 deletionsrc/api/encryption_keys_get.c
- src/api/encryption_keys_put_post.c 139 additions, 0 deletionssrc/api/encryption_keys_put_post.c
- src/api/encryption_remove_post.c 51 additions, 33 deletionssrc/api/encryption_remove_post.c
- src/api/encryption_unlock_post.c 2 additions, 1 deletionsrc/api/encryption_unlock_post.c
- src/api/ssh_keys_delete.c 2 additions, 1 deletionsrc/api/ssh_keys_delete.c
- src/api/ssh_keys_get.c 2 additions, 1 deletionsrc/api/ssh_keys_get.c
- src/api/ssh_keys_post.c 2 additions, 1 deletionsrc/api/ssh_keys_post.c
- src/api/ssh_keys_put.c 2 additions, 1 deletionsrc/api/ssh_keys_put.c
- src/auxiliary.c 16 additions, 9 deletionssrc/auxiliary.c
- src/cryptops-api.c 6 additions, 3 deletionssrc/cryptops-api.c
- src/encryption_functions.c 25 additions, 19 deletionssrc/encryption_functions.c
Loading
Please register or sign in to comment