Fix algorithm handling for ECC ciphersuites: Adapt to recent changes,