Almost completely fixed SRP6.

M1 is still broken, despite everything else being fine.