Merge branch 'ecc'

This pulls in the NIST P384/256/192 x509 changes.