Internal changes in preparation for key rotation

- two sets of keys
- separate function for key generation/update
2 files changed