anchor.diff:  mix_sign(Config) ->
       mix_sign_rsa_peer(Config),
       mix_sign_ecdsa_peer(Config).
  - 
  +
   mix_sign_ecdsa_peer(Config) ->
       {COpts0, SOpts0} = ssl_test_lib:make_mix_cert([{mix, peer_ecc} |Config]),
  -    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
  +    COpts = ssl_test_lib:ssl_options(COpts0, Config),
       SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
       ECDHE_ECDSA =
  -        ssl:filter_cipher_suites(ssl:cipher_suites(default, 'tlsv1.2'), 
  +        ssl:filter_cipher_suites(ssl:cipher_suites(default, 'tlsv1.2'),
                                    [{key_exchange, fun(ecdhe_ecdsa) -> true; (_) -> false end}]),
       ssl_test_lib:basic_test(COpts, [{ciphers, ECDHE_ECDSA} | SOpts], Config).
  - 
  +
   
   mix_sign_rsa_peer(Config) ->
       {COpts0, SOpts0} = ssl_test_lib:make_mix_cert([{mix, peer_rsa} |Config]),
  -    COpts = ssl_test_lib:ssl_options(COpts0, Config), 
  +    COpts = ssl_test_lib:ssl_options(COpts0, Config),
       SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
       ECDHE_RSA =
  -        ssl:filter_cipher_suites(ssl:cipher_suites(default, 'tlsv1.2'), 
  +        ssl:filter_cipher_suites(ssl:cipher_suites(default, 'tlsv1.2'),
                                    [{key_exchange, fun(ecdhe_rsa) -> true; (_) -> false end}]),
       ssl_test_lib:basic_test(COpts, [{ciphers, ECDHE_RSA} | SOpts], Config).
  -    
  
positive.code: client_ecdh_rsa_server_ecdhe_rsa_server_custom(Config) ->
      Default = ssl_test_lib:default_cert_chain_conf(),
      DefaultCurve = pubkey_cert_records:namedCurves(hd(tls_v1:ecc_curves(1))),
      {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
                                                           {client_chain, Default}],
                                                          ecdh_rsa, ecdhe_rsa, Config),
      COpts = ssl_test_lib:ssl_options(COpts0, Config), 
      SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
      ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, DefaultCurve]}],
      
      case ssl_test_lib:supported_eccs(ECCOpts) of
          true -> ssl_test_lib:ecc_test(secp256r1, COpts, SOpts, [], ECCOpts, Config);
          false -> {skip, "unsupported named curves"}
  
negative.code:     Default = ssl_test_lib:default_cert_chain_conf(),
      DefaultCurve = pubkey_cert_records:namedCurves(hd(tls_v1:ecc_curves(1))),
      {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default},
                                                         {client_chain, Default}],
                                                          ecdh_rsa, ecdhe_ecdsa, Config),
      COpts = ssl_test_lib:ssl_options(COpts0, Config),
      SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
      ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, DefaultCurve]}],
       case ssl_test_lib:supported_eccs(ECCOpts) of
  