Adjustments for SRP

Removing references to PSK.

Giving each key its own ID.