Akihiro Sagawa : secur32: Return correct key exchange algorithm value.

Alexandre Julliard julliard at winehq.org
Wed Apr 19 14:49:38 CDT 2017


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

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Mon Apr 17 23:26:04 2017 +0900

secur32: Return correct key exchange algorithm value.

Signed-off-by: Akihiro Sagawa <sagawa.aki at gmail.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/secur32/schannel_gnutls.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c
index da83482..44e88bd 100644
--- a/dlls/secur32/schannel_gnutls.c
+++ b/dlls/secur32/schannel_gnutls.c
@@ -343,10 +343,9 @@ static ALG_ID schannel_get_kx_algid(int kx)
     case GNUTLS_KX_DHE_DSS:
     case GNUTLS_KX_DHE_RSA: return CALG_DH_EPHEM;
     case GNUTLS_KX_ANON_ECDH: return CALG_ECDH;
-    /* MSDN mentions CALG_ECDH_EPHEM, but doesn't appear in the Windows SDK. */
     case GNUTLS_KX_ECDHE_RSA:
-    case GNUTLS_KX_ECDHE_PSK: return CALG_ECDH;
-    case GNUTLS_KX_ECDHE_ECDSA: return CALG_ECDSA;
+    case GNUTLS_KX_ECDHE_PSK:
+    case GNUTLS_KX_ECDHE_ECDSA: return CALG_ECDH_EPHEM;
     default:
         FIXME("unknown algorithm %d\n", kx);
         return 0;




More information about the wine-cvs mailing list