am c7fe66ea: Merge "Revert to old-style API for EC_KEY handling"

* commit 'c7fe66ead0ce5fde575359527110fe2616321594':
  Revert to old-style API for EC_KEY handling