Ken Thomases : secur32: On Mac, recognize key exchange algorithm for cipher suites using ECDH.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4ccb8746fde08a21e533558a417816279e2c8620
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4ccb8746fde08a21e533558a41...

Author: Ken Thomases <ken(a)codeweavers.com>
Date:   Fri Jul 13 15:19:23 2012 -0500

secur32: On Mac, recognize key exchange algorithm for cipher suites using ECDH.

---

 dlls/secur32/schannel_macosx.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c
index 01493b1..d4576b9 100644
--- a/dlls/secur32/schannel_macosx.c
+++ b/dlls/secur32/schannel_macosx.c
@@ -330,6 +330,11 @@ static ALG_ID schan_get_kx_algid(const struct cipher_suite* c)
     case schan_kx_DHE_DSS:
     case schan_kx_DHE_RSA_EXPORT:
     case schan_kx_DHE_RSA:          return CALG_DH_EPHEM;
+    case schan_kx_ECDH_anon:
+    case schan_kx_ECDH_ECDSA:
+    case schan_kx_ECDH_RSA:
+    case schan_kx_ECDHE_ECDSA:
+    case schan_kx_ECDHE_RSA:        return CALG_ECDH;
     case schan_kx_NULL:             return 0;
     case schan_kx_RSA:              return CALG_RSA_KEYX;
 
@@ -339,11 +344,6 @@ static ALG_ID schan_get_kx_algid(const struct cipher_suite* c)
     case schan_kx_DH_DSS:
     case schan_kx_DH_RSA_EXPORT:
     case schan_kx_DH_RSA:
-    case schan_kx_ECDH_anon:
-    case schan_kx_ECDH_ECDSA:
-    case schan_kx_ECDH_RSA:
-    case schan_kx_ECDHE_ECDSA:
-    case schan_kx_ECDHE_RSA:
     case schan_kx_FORTEZZA_DMS:
     case schan_kx_RSA_EXPORT:
         FIXME("Don't know CALG for key exchange algorithm %d for cipher suite %#x, returning 0\n", c->kx_alg, (unsigned)c->suite);