mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 16:18:48 -05:00
schannel: Code cleanup
This commit is contained in:
parent
f96f1f3165
commit
445245ca85
@ -40,10 +40,8 @@
|
|||||||
* TODO list for TLS/SSL implementation:
|
* TODO list for TLS/SSL implementation:
|
||||||
* - implement session handling and re-use
|
* - implement session handling and re-use
|
||||||
* - implement write buffering
|
* - implement write buffering
|
||||||
* - implement verification options
|
|
||||||
* - implement verification results
|
|
||||||
* - implement SSL/TLS shutdown
|
* - implement SSL/TLS shutdown
|
||||||
* - special cases: negotiation, certificates, algorithms
|
* - special cases: renegotiation, certificates, algorithms
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "setup.h"
|
#include "setup.h"
|
||||||
@ -132,8 +130,6 @@ schannel_connect_step1(struct connectdata *conn, int sockindex) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO: implement verification options */
|
|
||||||
|
|
||||||
/* http://msdn.microsoft.com/en-us/library/windows/desktop/aa374716.aspx */
|
/* http://msdn.microsoft.com/en-us/library/windows/desktop/aa374716.aspx */
|
||||||
sspi_status = s_pSecFn->AcquireCredentialsHandleA(NULL,
|
sspi_status = s_pSecFn->AcquireCredentialsHandleA(NULL,
|
||||||
UNISP_NAME_A, SECPKG_CRED_OUTBOUND, NULL, &schannel_cred,
|
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 */
|
/* check if the handshake is complete */
|
||||||
if(sspi_status == SEC_E_OK) {
|
if(sspi_status == SEC_E_OK) {
|
||||||
infof(data, "schannel: handshake complete\n");
|
|
||||||
|
|
||||||
/* TODO: implement verification results */
|
|
||||||
|
|
||||||
connssl->connecting_state = ssl_connect_3;
|
connssl->connecting_state = ssl_connect_3;
|
||||||
infof(data, "SSL connected\n");
|
infof(data, "schannel: handshake complete\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
return CURLE_OK;
|
return CURLE_OK;
|
||||||
@ -376,7 +368,7 @@ schannel_connect_step3(struct connectdata *conn, int sockindex) {
|
|||||||
|
|
||||||
DEBUGASSERT(ssl_connect_3 == connssl->connecting_state);
|
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))
|
if(!(connssl->ret_flags & ISC_RET_SEQUENCE_DETECT))
|
||||||
failf(data, "schannel: failed to setup sequence detection\n");
|
failf(data, "schannel: failed to setup sequence detection\n");
|
||||||
if(!(connssl->ret_flags & ISC_RET_REPLAY_DETECT))
|
if(!(connssl->ret_flags & ISC_RET_REPLAY_DETECT))
|
||||||
|
Loading…
Reference in New Issue
Block a user