diff options
| author | Marc Hoersken <info@marc-hoersken.de> | 2012-04-09 22:43:48 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-06-11 19:00:34 +0200 |
| commit | 445245ca85f8fa2ecfa823e2e534244f15874a02 (patch) | |
| tree | 58e0430188059cea22c21ac108dabb3eb70c499b | |
| parent | f96f1f316585669933d4a53b460aa3ab20d237e2 (diff) | |
schannel: Code cleanup
| -rw-r--r-- | lib/curl_schannel.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/lib/curl_schannel.c b/lib/curl_schannel.c index 2ad0e0d8f..761933820 100644 --- a/lib/curl_schannel.c +++ b/lib/curl_schannel.c @@ -40,10 +40,8 @@ * TODO list for TLS/SSL implementation: * - implement session handling and re-use * - implement write buffering - * - implement verification options - * - implement verification results * - implement SSL/TLS shutdown - * - special cases: negotiation, certificates, algorithms + * - special cases: renegotiation, certificates, algorithms */ #include "setup.h" @@ -132,8 +130,6 @@ schannel_connect_step1(struct connectdata *conn, int sockindex) { break; } - /* TODO: implement verification options */ - /* http://msdn.microsoft.com/en-us/library/windows/desktop/aa374716.aspx */ sspi_status = s_pSecFn->AcquireCredentialsHandleA(NULL, UNISP_NAME_A, SECPKG_CRED_OUTBOUND, NULL, &schannel_cred, @@ -358,12 +354,8 @@ schannel_connect_step2(struct connectdata *conn, int sockindex) { /* check if the handshake is complete */ if(sspi_status == SEC_E_OK) { - infof(data, "schannel: handshake complete\n"); - - /* TODO: implement verification results */ - connssl->connecting_state = ssl_connect_3; - infof(data, "SSL connected\n"); + infof(data, "schannel: handshake complete\n"); } return CURLE_OK; @@ -376,7 +368,7 @@ schannel_connect_step3(struct connectdata *conn, int sockindex) { DEBUGASSERT(ssl_connect_3 == connssl->connecting_state); - if (connssl->ret_flags != connssl->req_flags) { + if(connssl->ret_flags != connssl->req_flags) { if(!(connssl->ret_flags & ISC_RET_SEQUENCE_DETECT)) failf(data, "schannel: failed to setup sequence detection\n"); if(!(connssl->ret_flags & ISC_RET_REPLAY_DETECT)) |