wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Ken Thomases : secur32: Add alternative schannel implementation for Mac OS X.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 5015f388d1cd1db86609e2414b9ea660383f8dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5015f388d1cd1db86609e2414… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:48 2011 -0500 secur32: Add alternative schannel implementation for Mac OS X. It uses the native Secure Transport API rather than GnuTLS. --- dlls/secur32/Makefile.in | 2 + dlls/secur32/schannel.c | 6 +- dlls/secur32/schannel_gnutls.c | 4 +- dlls/secur32/schannel_macosx.c | 791 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 798 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5015f388d1cd1db86609e…

1 0

Ken Thomases : configure: Add test for Security/Security.h header.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 25ed687fe66045a2b06578a8912486dbecc5e1c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ed687fe66045a2b06578a89… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:44 2011 -0500 configure: Add test for Security/Security.h header. --- configure | 1 + configure.ac | 1 + include/config.h.in | 3 +++ 3 files changed, 5 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 0d715db..3651711 100755 --- a/configure +++ b/configure @@ -5782,6 +5782,7 @@ for ac_header in \ OpenAL/al.h \ OpenCL/opencl.h \ QuickTime/ImageCompression.h \ + Security/Security.h \ alias.h \ alsa/asoundlib.h \ arpa/inet.h \ diff --git a/configure.ac b/configure.ac index edbf111..8314579 100644 --- a/configure.ac +++ b/configure.ac @@ -383,6 +383,7 @@ AC_CHECK_HEADERS(\ OpenAL/al.h \ OpenCL/opencl.h \ QuickTime/ImageCompression.h \ + Security/Security.h \ alias.h \ alsa/asoundlib.h \ arpa/inet.h \ diff --git a/include/config.h.in b/include/config.h.in index 7195429..44b6bb6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -716,6 +716,9 @@ /* Define to 1 if you have the <scsi/sg.h> header file. */ #undef HAVE_SCSI_SG_H +/* Define to 1 if you have the <Security/Security.h> header file. */ +#undef HAVE_SECURITY_SECURITY_H + /* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT

1 0

Ken Thomases : secur32: Separate GnuTLS schannel implementation into separate file.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 0b396208db68c950725adae49cedd1486ee56afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b396208db68c950725adae49… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:40 2011 -0500 secur32: Separate GnuTLS schannel implementation into separate file. --- dlls/secur32/Makefile.in | 1 + dlls/secur32/schannel.c | 443 +-------------------------------------- dlls/secur32/schannel_gnutls.c | 462 ++++++++++++++++++++++++++++++++++++++++ dlls/secur32/secur32_priv.h | 37 ++++ 4 files changed, 503 insertions(+), 440 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b396208db68c950725ad…

1 0

Ken Thomases : secur32: Make no-implementation error message non-GnuTLS-specific.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: c890bf4dc8dae67ff4119de78bfd49d84c6b5ddf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c890bf4dc8dae67ff4119de78… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:36 2011 -0500 secur32: Make no-implementation error message non-GnuTLS-specific. --- dlls/secur32/schannel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 0e49112..4cebf4b 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1757,7 +1757,7 @@ void SECUR32_deinitSchannelSP(void) void SECUR32_initSchannelSP(void) { - ERR("libgnutls not found, SSL connections will fail\n"); + ERR("TLS library not found, SSL connections will fail\n"); } void SECUR32_deinitSchannelSP(void) {}

1 0

Ken Thomases : secur32: Extract schan_imp_init/deinit functions.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 2cecf544277a99c2db62d301c0b1ca2a34989117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cecf544277a99c2db62d301c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:31 2011 -0500 secur32: Extract schan_imp_init/deinit functions. --- dlls/secur32/schannel.c | 149 ++++++++++++++++++++++++++-------------------- 1 files changed, 84 insertions(+), 65 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index da19b36..0e49112 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -391,6 +391,86 @@ static void schan_imp_free_certificate_credentials(schan_imp_certificate_credent pgnutls_certificate_free_credentials((gnutls_certificate_credentials)c); } +static void schan_gnutls_log(int level, const char *msg) +{ + TRACE("<%d> %s", level, msg); +} + +static BOOL schan_imp_init(void) +{ + int ret; + + libgnutls_handle = wine_dlopen(SONAME_LIBGNUTLS, RTLD_NOW, NULL, 0); + if (!libgnutls_handle) + { + WARN("Failed to load libgnutls.\n"); + return FALSE; + } + +#define LOAD_FUNCPTR(f) \ + if (!(p##f = wine_dlsym(libgnutls_handle, #f, NULL, 0))) \ + { \ + ERR("Failed to load %s\n", #f); \ + goto fail; \ + } + + LOAD_FUNCPTR(gnutls_alert_get) + LOAD_FUNCPTR(gnutls_alert_get_name) + LOAD_FUNCPTR(gnutls_certificate_allocate_credentials) + LOAD_FUNCPTR(gnutls_certificate_free_credentials) + LOAD_FUNCPTR(gnutls_certificate_get_peers) + LOAD_FUNCPTR(gnutls_cipher_get) + LOAD_FUNCPTR(gnutls_cipher_get_key_size) + LOAD_FUNCPTR(gnutls_credentials_set) + LOAD_FUNCPTR(gnutls_deinit) + LOAD_FUNCPTR(gnutls_global_deinit) + LOAD_FUNCPTR(gnutls_global_init) + LOAD_FUNCPTR(gnutls_global_set_log_function) + LOAD_FUNCPTR(gnutls_global_set_log_level) + LOAD_FUNCPTR(gnutls_handshake) + LOAD_FUNCPTR(gnutls_init) + LOAD_FUNCPTR(gnutls_kx_get) + LOAD_FUNCPTR(gnutls_mac_get) + LOAD_FUNCPTR(gnutls_mac_get_key_size) + LOAD_FUNCPTR(gnutls_perror) + LOAD_FUNCPTR(gnutls_protocol_get_version) + LOAD_FUNCPTR(gnutls_set_default_priority) + LOAD_FUNCPTR(gnutls_record_recv); + LOAD_FUNCPTR(gnutls_record_send); + LOAD_FUNCPTR(gnutls_transport_set_errno) + LOAD_FUNCPTR(gnutls_transport_set_ptr) + LOAD_FUNCPTR(gnutls_transport_set_pull_function) + LOAD_FUNCPTR(gnutls_transport_set_push_function) +#undef LOAD_FUNCPTR + + ret = pgnutls_global_init(); + if (ret != GNUTLS_E_SUCCESS) + { + pgnutls_perror(ret); + goto fail; + } + + if (TRACE_ON(secur32)) + { + pgnutls_global_set_log_level(4); + pgnutls_global_set_log_function(schan_gnutls_log); + } + + return TRUE; + +fail: + wine_dlclose(libgnutls_handle, NULL, 0); + libgnutls_handle = NULL; + return FALSE; +} + +static void schan_imp_deinit(void) +{ + pgnutls_global_deinit(); + wine_dlclose(libgnutls_handle, NULL, 0); + libgnutls_handle = NULL; +} + #define SCHAN_INVALID_HANDLE ~0UL @@ -1520,11 +1600,6 @@ static SECURITY_STATUS SEC_ENTRY schan_DeleteSecurityContext(PCtxtHandle context return SEC_E_OK; } -static void schan_gnutls_log(int level, const char *msg) -{ - TRACE("<%d> %s", level, msg); -} - static const SecurityFunctionTableA schanTableA = { 1, NULL, /* EnumerateSecurityPackagesA */ @@ -1616,63 +1691,9 @@ void SECUR32_initSchannelSP(void) (SEC_WCHAR *)schannelComment }, }; SecureProvider *provider; - int ret; - libgnutls_handle = wine_dlopen(SONAME_LIBGNUTLS, RTLD_NOW, NULL, 0); - if (!libgnutls_handle) - { - WARN("Failed to load libgnutls.\n"); + if (!schan_imp_init()) return; - } - -#define LOAD_FUNCPTR(f) \ - if (!(p##f = wine_dlsym(libgnutls_handle, #f, NULL, 0))) \ - { \ - ERR("Failed to load %s\n", #f); \ - goto fail; \ - } - - LOAD_FUNCPTR(gnutls_alert_get) - LOAD_FUNCPTR(gnutls_alert_get_name) - LOAD_FUNCPTR(gnutls_certificate_allocate_credentials) - LOAD_FUNCPTR(gnutls_certificate_free_credentials) - LOAD_FUNCPTR(gnutls_certificate_get_peers) - LOAD_FUNCPTR(gnutls_cipher_get) - LOAD_FUNCPTR(gnutls_cipher_get_key_size) - LOAD_FUNCPTR(gnutls_credentials_set) - LOAD_FUNCPTR(gnutls_deinit) - LOAD_FUNCPTR(gnutls_global_deinit) - LOAD_FUNCPTR(gnutls_global_init) - LOAD_FUNCPTR(gnutls_global_set_log_function) - LOAD_FUNCPTR(gnutls_global_set_log_level) - LOAD_FUNCPTR(gnutls_handshake) - LOAD_FUNCPTR(gnutls_init) - LOAD_FUNCPTR(gnutls_kx_get) - LOAD_FUNCPTR(gnutls_mac_get) - LOAD_FUNCPTR(gnutls_mac_get_key_size) - LOAD_FUNCPTR(gnutls_perror) - LOAD_FUNCPTR(gnutls_protocol_get_version) - LOAD_FUNCPTR(gnutls_set_default_priority) - LOAD_FUNCPTR(gnutls_record_recv); - LOAD_FUNCPTR(gnutls_record_send); - LOAD_FUNCPTR(gnutls_transport_set_errno) - LOAD_FUNCPTR(gnutls_transport_set_ptr) - LOAD_FUNCPTR(gnutls_transport_set_pull_function) - LOAD_FUNCPTR(gnutls_transport_set_push_function) -#undef LOAD_FUNCPTR - - ret = pgnutls_global_init(); - if (ret != GNUTLS_E_SUCCESS) - { - pgnutls_perror(ret); - goto fail; - } - - if (TRACE_ON(secur32)) - { - pgnutls_global_set_log_level(4); - pgnutls_global_set_log_function(schan_gnutls_log); - } schan_handle_table = HeapAlloc(GetProcessHeap(), 0, 64 * sizeof(*schan_handle_table)); if (!schan_handle_table) @@ -1696,8 +1717,7 @@ void SECUR32_initSchannelSP(void) fail: HeapFree(GetProcessHeap(), 0, schan_handle_table); schan_handle_table = NULL; - wine_dlclose(libgnutls_handle, NULL, 0); - libgnutls_handle = NULL; + schan_imp_deinit(); return; } @@ -1705,7 +1725,7 @@ void SECUR32_deinitSchannelSP(void) { SIZE_T i = schan_handle_count; - if (!libgnutls_handle) return; + if (!schan_handle_table) return; /* deinitialized sessions first because a pointer to the credentials * may be stored for the session. */ @@ -1730,8 +1750,7 @@ void SECUR32_deinitSchannelSP(void) } } HeapFree(GetProcessHeap(), 0, schan_handle_table); - pgnutls_global_deinit(); - wine_dlclose(libgnutls_handle, NULL, 0); + schan_imp_deinit(); } #else /* SONAME_LIBGNUTLS */

1 0

Ken Thomases : secur32: Extract schan_imp_allocate/ free_certificate_credentials functions.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 9124cdc2346a4ff37c072c4d4a9082d50a119138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9124cdc2346a4ff37c072c4d4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:24 2011 -0500 secur32: Extract schan_imp_allocate/free_certificate_credentials functions. --- dlls/secur32/schannel.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index ff9a118..da19b36 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -73,6 +73,7 @@ MAKE_FUNCPTR(gnutls_transport_set_push_function); typedef struct schan_imp_session_opaque *schan_imp_session; +typedef struct schan_imp_certificate_credentials_opaque *schan_imp_certificate_credentials; struct schan_transport; @@ -116,7 +117,7 @@ static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, } static BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, - gnutls_certificate_credentials cred) + schan_imp_certificate_credentials cred) { gnutls_session_t *s = (gnutls_session_t*)session; @@ -137,7 +138,8 @@ static BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, return FALSE; } - err = pgnutls_credentials_set(*s, GNUTLS_CRD_CERTIFICATE, cred); + err = pgnutls_credentials_set(*s, GNUTLS_CRD_CERTIFICATE, + (gnutls_certificate_credentials)cred); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -376,6 +378,19 @@ static SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, return SEC_E_OK; } +static BOOL schan_imp_allocate_certificate_credentials(schan_imp_certificate_credentials *c) +{ + int ret = pgnutls_certificate_allocate_credentials((gnutls_certificate_credentials*)c); + if (ret != GNUTLS_E_SUCCESS) + pgnutls_perror(ret); + return (ret == GNUTLS_E_SUCCESS); +} + +static void schan_imp_free_certificate_credentials(schan_imp_certificate_credentials c) +{ + pgnutls_certificate_free_credentials((gnutls_certificate_credentials)c); +} + #define SCHAN_INVALID_HANDLE ~0UL @@ -395,7 +410,7 @@ struct schan_handle struct schan_credentials { ULONG credential_use; - gnutls_certificate_credentials credentials; + schan_imp_certificate_credentials credentials; }; struct schan_context @@ -666,7 +681,6 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan if (st == SEC_E_OK) { ULONG_PTR handle; - int ret; creds = HeapAlloc(GetProcessHeap(), 0, sizeof(*creds)); if (!creds) return SEC_E_INSUFFICIENT_MEMORY; @@ -675,10 +689,8 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan if (handle == SCHAN_INVALID_HANDLE) goto fail; creds->credential_use = SECPKG_CRED_OUTBOUND; - ret = pgnutls_certificate_allocate_credentials(&creds->credentials); - if (ret != GNUTLS_E_SUCCESS) + if (!schan_imp_allocate_certificate_credentials(&creds->credentials)) { - pgnutls_perror(ret); schan_free_handle(handle, SCHAN_HANDLE_CRED); goto fail; } @@ -785,7 +797,7 @@ static SECURITY_STATUS SEC_ENTRY schan_FreeCredentialsHandle( if (!creds) return SEC_E_INVALID_HANDLE; if (creds->credential_use == SECPKG_CRED_OUTBOUND) - pgnutls_certificate_free_credentials(creds->credentials); + schan_imp_free_certificate_credentials(creds->credentials); HeapFree(GetProcessHeap(), 0, creds); return SEC_E_OK; @@ -1713,7 +1725,7 @@ void SECUR32_deinitSchannelSP(void) { struct schan_credentials *cred; cred = schan_free_handle(i, SCHAN_HANDLE_CRED); - pgnutls_certificate_free_credentials(cred->credentials); + schan_imp_free_certificate_credentials(cred->credentials); HeapFree(GetProcessHeap(), 0, cred); } }

1 0

Ken Thomases : secur32: Use opaque type schan_imp_session in schan_imp interface.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: e02ac5f023ada68ae62414b0a89e67df4999b493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02ac5f023ada68ae62414b0a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:18 2011 -0500 secur32: Use opaque type schan_imp_session in schan_imp interface. --- dlls/secur32/schannel.c | 40 ++++++++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 14 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index f7e05be..ff9a118 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -72,20 +72,22 @@ MAKE_FUNCPTR(gnutls_transport_set_push_function); #undef MAKE_FUNCPTR +typedef struct schan_imp_session_opaque *schan_imp_session; + struct schan_transport; static int schan_pull(struct schan_transport *t, void *buff, size_t *buff_len); static int schan_push(struct schan_transport *t, const void *buff, size_t *buff_len); -static gnutls_session_t schan_session_for_transport(struct schan_transport* t); +static schan_imp_session schan_session_for_transport(struct schan_transport* t); static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { struct schan_transport *t = (struct schan_transport*)transport; - gnutls_session_t s = schan_session_for_transport(t); + gnutls_session_t s = (gnutls_session_t)schan_session_for_transport(t); int ret = schan_pull(transport, buff, &buff_len); if (ret) @@ -101,7 +103,7 @@ static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, const void *buff, size_t buff_len) { struct schan_transport *t = (struct schan_transport*)transport; - gnutls_session_t s = schan_session_for_transport(t); + gnutls_session_t s = (gnutls_session_t)schan_session_for_transport(t); int ret = schan_push(transport, buff, &buff_len); if (ret) @@ -113,9 +115,11 @@ static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, return buff_len; } -static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server, +static BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, gnutls_certificate_credentials cred) { + gnutls_session_t *s = (gnutls_session_t*)session; + int err = pgnutls_init(s, is_server ? GNUTLS_SERVER : GNUTLS_CLIENT); if (err != GNUTLS_E_SUCCESS) { @@ -147,19 +151,22 @@ static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server, return TRUE; } -static void schan_imp_dispose_session(gnutls_session_t s) +static void schan_imp_dispose_session(schan_imp_session session) { + gnutls_session_t s = (gnutls_session_t)session; pgnutls_deinit(s); } -static void schan_imp_set_session_transport(gnutls_session_t s, +static void schan_imp_set_session_transport(schan_imp_session session, struct schan_transport *t) { + gnutls_session_t s = (gnutls_session_t)session; pgnutls_transport_set_ptr(s, (gnutls_transport_ptr_t)t); } -static SECURITY_STATUS schan_imp_handshake(gnutls_session_t s) +static SECURITY_STATUS schan_imp_handshake(schan_imp_session session) { + gnutls_session_t s = (gnutls_session_t)session; int err = pgnutls_handshake(s); switch(err) { @@ -285,15 +292,17 @@ static ALG_ID schannel_get_kx_algid(gnutls_kx_algorithm_t kx) } } -static unsigned int schan_imp_get_session_cipher_block_size(gnutls_session_t s) +static unsigned int schan_imp_get_session_cipher_block_size(schan_imp_session session) { + gnutls_session_t s = (gnutls_session_t)session; gnutls_cipher_algorithm_t cipher = pgnutls_cipher_get(s); return schannel_get_cipher_block_size(cipher); } -static SECURITY_STATUS schan_imp_get_connection_info(gnutls_session_t s, +static SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, SecPkgContext_ConnectionInfo *info) { + gnutls_session_t s = (gnutls_session_t)session; gnutls_protocol_t proto = pgnutls_protocol_get_version(s); gnutls_cipher_algorithm_t alg = pgnutls_cipher_get(s); gnutls_mac_algorithm_t mac = pgnutls_mac_get(s); @@ -310,9 +319,10 @@ static SECURITY_STATUS schan_imp_get_connection_info(gnutls_session_t s, return SEC_E_OK; } -static SECURITY_STATUS schan_imp_get_session_peer_certificate(gnutls_session_t s, +static SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, PCCERT_CONTEXT *cert) { + gnutls_session_t s = (gnutls_session_t)session; unsigned int list_size; const gnutls_datum_t *datum; @@ -330,9 +340,10 @@ static SECURITY_STATUS schan_imp_get_session_peer_certificate(gnutls_session_t s return SEC_E_INTERNAL_ERROR; } -static SECURITY_STATUS schan_imp_send(gnutls_session_t s, const void *buffer, +static SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, size_t *length) { + gnutls_session_t s = (gnutls_session_t)session; ssize_t ret = pgnutls_record_send(s, buffer, *length); if (ret >= 0) *length = ret; @@ -347,9 +358,10 @@ static SECURITY_STATUS schan_imp_send(gnutls_session_t s, const void *buffer, return SEC_E_OK; } -static SECURITY_STATUS schan_imp_recv(gnutls_session_t s, void *buffer, +static SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, size_t *length) { + gnutls_session_t s = (gnutls_session_t)session; ssize_t ret = pgnutls_record_recv(s, buffer, *length); if (ret >= 0) *length = ret; @@ -388,7 +400,7 @@ struct schan_credentials struct schan_context { - gnutls_session_t session; + schan_imp_session session; ULONG req_ctx_attr; }; @@ -964,7 +976,7 @@ static int schan_push(struct schan_transport *t, const void *buff, size_t *buff_ return 0; } -static gnutls_session_t schan_session_for_transport(struct schan_transport* t) +static schan_imp_session schan_session_for_transport(struct schan_transport* t) { return t->ctx->session; }

1 0

Ken Thomases : secur32: Set session credentials in schan_imp_create_session .
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 6b5f7df5cb8997c5ac5e59854812a907795bc8ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b5f7df5cb8997c5ac5e59854… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:14 2011 -0500 secur32: Set session credentials in schan_imp_create_session. --- dlls/secur32/schannel.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 3db2772..f7e05be 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -113,7 +113,8 @@ static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, return buff_len; } -static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server) +static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server, + gnutls_certificate_credentials cred) { int err = pgnutls_init(s, is_server ? GNUTLS_SERVER : GNUTLS_CLIENT); if (err != GNUTLS_E_SUCCESS) @@ -132,6 +133,14 @@ static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server) return FALSE; } + err = pgnutls_credentials_set(*s, GNUTLS_CRD_CERTIFICATE, cred); + if (err != GNUTLS_E_SUCCESS) + { + pgnutls_perror(err); + pgnutls_deinit(*s); + return FALSE; + } + pgnutls_transport_set_pull_function(*s, schan_pull_adapter); pgnutls_transport_set_push_function(*s, schan_push_adapter); @@ -1010,7 +1019,6 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( struct schan_buffers *out_buffers; struct schan_credentials *cred; struct schan_transport transport; - int err; SECURITY_STATUS ret; TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, @@ -1045,22 +1053,13 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INTERNAL_ERROR; } - if (!schan_imp_create_session(&ctx->session, FALSE)) + if (!schan_imp_create_session(&ctx->session, FALSE, cred->credentials)) { schan_free_handle(handle, SCHAN_HANDLE_CTX); HeapFree(GetProcessHeap(), 0, ctx); return SEC_E_INTERNAL_ERROR; } - err = pgnutls_credentials_set(ctx->session, GNUTLS_CRD_CERTIFICATE, cred->credentials); - if (err != GNUTLS_E_SUCCESS) - { - pgnutls_perror(err); - schan_imp_dispose_session(ctx->session); - schan_free_handle(handle, SCHAN_HANDLE_CTX); - HeapFree(GetProcessHeap(), 0, ctx); - } - phNewContext->dwLower = handle; phNewContext->dwUpper = 0; } @@ -1685,7 +1684,7 @@ void SECUR32_deinitSchannelSP(void) if (!libgnutls_handle) return; /* deinitialized sessions first because a pointer to the credentials - * are stored for the session by calling gnutls_credentials_set. */ + * may be stored for the session. */ while (i--) { if (schan_handle_table[i].type == SCHAN_HANDLE_CTX)

1 0

Ken Thomases : secur32: Set push & pull functions in schan_imp_create_session.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 3d47fce382ddf2a71ecf1e09b698cbc134634c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d47fce382ddf2a71ecf1e09b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:11 2011 -0500 secur32: Set push & pull functions in schan_imp_create_session. --- dlls/secur32/schannel.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 5404d90..3db2772 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -132,6 +132,9 @@ static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server) return FALSE; } + pgnutls_transport_set_pull_function(*s, schan_pull_adapter); + pgnutls_transport_set_push_function(*s, schan_push_adapter); + return TRUE; } @@ -1058,9 +1061,6 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( HeapFree(GetProcessHeap(), 0, ctx); } - pgnutls_transport_set_pull_function(ctx->session, schan_pull_adapter); - pgnutls_transport_set_push_function(ctx->session, schan_push_adapter); - phNewContext->dwLower = handle; phNewContext->dwUpper = 0; }

1 0

Ken Thomases : secur32: Extract GnuTLS-isms from schan_push to schan_push_adapter.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: c86dafe51e7032462b1be9ee9160972d9fff78f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c86dafe51e7032462b1be9ee9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:03 2011 -0500 secur32: Extract GnuTLS-isms from schan_push to schan_push_adapter. --- dlls/secur32/schannel.c | 60 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 47 insertions(+), 13 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 9a6864f..5404d90 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -76,6 +76,7 @@ struct schan_transport; static int schan_pull(struct schan_transport *t, void *buff, size_t *buff_len); +static int schan_push(struct schan_transport *t, const void *buff, size_t *buff_len); static gnutls_session_t schan_session_for_transport(struct schan_transport* t); @@ -96,6 +97,22 @@ static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, return buff_len; } +static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, + const void *buff, size_t buff_len) +{ + struct schan_transport *t = (struct schan_transport*)transport; + gnutls_session_t s = schan_session_for_transport(t); + + int ret = schan_push(transport, buff, &buff_len); + if (ret) + { + pgnutls_transport_set_errno(s, ret); + return -1; + } + + return buff_len; +} + static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server) { int err = pgnutls_init(s, is_server ? GNUTLS_SERVER : GNUTLS_CLIENT); @@ -896,26 +913,43 @@ static int schan_pull(struct schan_transport *t, void *buff, size_t *buff_len) return 0; } -static ssize_t schan_push(gnutls_transport_ptr_t transport, const void *buff, size_t buff_len) +/* schan_push + * Write data to the transport output buffer. + * + * t - The session transport object. + * buff - The buffer of data to write. Must be at least *buff_len bytes in length. + * buff_len - On input, *buff_len is the desired length to write. On successful + * return, *buff_len is the number of bytes actually written. + * + * Returns: + * 0 on success + * *buff_len will be > 0 indicating how much data was written. May be less + * than what was requested, in which case the caller should call again + if/when they want to write more. + * EAGAIN when no data could be written without blocking + * another errno-style error value on failure + * + */ +static int schan_push(struct schan_transport *t, const void *buff, size_t *buff_len) { - struct schan_transport *t = transport; char *b; + size_t local_len = *buff_len; - TRACE("Push %zu bytes\n", buff_len); + TRACE("Push %zu bytes\n", local_len); + + *buff_len = 0; - b = schan_get_buffer(t, &t->out, &buff_len); + b = schan_get_buffer(t, &t->out, &local_len); if (!b) - { - pgnutls_transport_set_errno(t->ctx->session, EAGAIN); - return -1; - } + return EAGAIN; - memcpy(b, buff, buff_len); - t->out.offset += buff_len; + memcpy(b, buff, local_len); + t->out.offset += local_len; - TRACE("Wrote %zu bytes\n", buff_len); + TRACE("Wrote %zu bytes\n", local_len); - return buff_len; + *buff_len = local_len; + return 0; } static gnutls_session_t schan_session_for_transport(struct schan_transport* t) @@ -1025,7 +1059,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( } pgnutls_transport_set_pull_function(ctx->session, schan_pull_adapter); - pgnutls_transport_set_push_function(ctx->session, schan_push); + pgnutls_transport_set_push_function(ctx->session, schan_push_adapter); phNewContext->dwLower = handle; phNewContext->dwUpper = 0;

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011