wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-04 21:24:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

move secure r inside of tls extensions

Browse Source
This commit is contained in:
toddouska
2014-09-16 12:42:13 -07:00
parent 9a90a0c113
commit 4bb20612a1
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cyassl/internal.h
View File

@@ -1882,8 +1882,8 @@ typedef struct DtlsMsg {
typedef struct SecureR_State { typedef struct SecureR_State {
byte client_verify_data[TLS_FINISHED_SZ]; /* previous handshake value */ byte client_verify_data[TLS_FINISHED_SZ]; /* previous handshake value */
byte server_verify_data[TLS_FINISHED_SZ]; /* previous handshake value */ byte server_verify_data[TLS_FINISHED_SZ]; /* previous handshake value */
byte secure_renegotation; /* is current connection using */ byte secure_renegotation; /* extensions flag */
byte doing_secure_renegotation; /* are we doing it now flag */ byte previous_handshake_used; /* did previous handshake use secure r */
byte enabled; /* runtime allowed? */ byte enabled; /* runtime allowed? */
} SecureR_State; } SecureR_State;
@@ -2000,7 +2000,10 @@ struct CYASSL {
#ifdef HAVE_TRUNCATED_HMAC #ifdef HAVE_TRUNCATED_HMAC
byte truncated_hmac; byte truncated_hmac;
#endif #endif
#ifdef HAVE_SECURE_RENEGOTIATION
SecureR_State secureR_state; /* secure renegotiation state */
#endif #endif
#endif /* HAVE_TLS_EXTENSIONS */
#ifdef HAVE_NETX #ifdef HAVE_NETX
NetX_Ctx nxCtx; /* NetX IO Context */ NetX_Ctx nxCtx; /* NetX IO Context */
#endif #endif
@@ -2024,9 +2027,6 @@ struct CYASSL {
void* RsaDecCtx; /* Rsa Private Decrypt Callback Context */ void* RsaDecCtx; /* Rsa Private Decrypt Callback Context */
#endif /* NO_RSA */ #endif /* NO_RSA */
#endif /* HAVE_PK_CALLBACKS */ #endif /* HAVE_PK_CALLBACKS */
#ifdef HAVE_SECURE_RENEGOTIATION
SecureR_State secureR_state; /* secure renegotiation state */
#endif
}; };

12
src/internal.c
View File

@@ -1772,11 +1772,11 @@ int InitSSL(CYASSL* ssl, CYASSL_CTX* ctx)
#endif /* NO_RSA */ #endif /* NO_RSA */
#endif /* HAVE_PK_CALLBACKS */ #endif /* HAVE_PK_CALLBACKS */
#ifdef HAVE_SECURE_RENEGOTIATION #if defined(HAVE_SECURE_RENEGOTIATION) && defined(HAVE_TLS_EXTENSIONS)
ssl->secureR_state.secure_renegotation = 0; ssl->secureR_state.secure_renegotation = 0;
ssl->secureR_state.doing_secure_renegotation = 0; ssl->secureR_state.doing_secure_renegotation = 0;
ssl->secureR_state.enabled = 0; ssl->secureR_state.enabled = 0;
#endif /* HAVE_SECURE_RENEGOTIATION */ #endif /* HAVE_SECURE_RENEGOTIATION && HAVE_TLS_EXTENSIONS */
/* all done with init, now can return errors, call other stuff */ /* all done with init, now can return errors, call other stuff */
@@ -4404,7 +4404,7 @@ int DoFinished(CYASSL* ssl, const byte* input, word32* inOutIdx, word32 size,
} }
} }
#ifdef HAVE_SECURE_RENEGOTIATION #if defined(HAVE_SECURE_RENEGOTIATION) && defined(HAVE_TLS_EXTENSIONS)
if (ssl->secureR_state.enabled) { if (ssl->secureR_state.enabled) {
/* save peer's state */ /* save peer's state */
if (ssl->options.side == CYASSL_CLIENT_END) if (ssl->options.side == CYASSL_CLIENT_END)
@@ -4414,7 +4414,7 @@ int DoFinished(CYASSL* ssl, const byte* input, word32* inOutIdx, word32 size,
XMEMCPY(ssl->secureR_state.client_verify_data, input + *inOutIdx, XMEMCPY(ssl->secureR_state.client_verify_data, input + *inOutIdx,
TLS_FINISHED_SZ); TLS_FINISHED_SZ);
} }
#endif /* HAVE_SECURE_RENEGOTIATION */ #endif /* (HAVE_SECURE_RENEGOTIATION) && (HAVE_TLS_EXTENSIONS) */
/* force input exhaustion at ProcessReply consuming padSz */ /* force input exhaustion at ProcessReply consuming padSz */
*inOutIdx += size + ssl->keys.padSz; *inOutIdx += size + ssl->keys.padSz;
@@ -6732,7 +6732,7 @@ int SendFinished(CYASSL* ssl)
ssl->options.side == CYASSL_CLIENT_END ? client : server); ssl->options.side == CYASSL_CLIENT_END ? client : server);
if (ret != 0) return ret; if (ret != 0) return ret;
#ifdef HAVE_SECURE_RENEGOTIATION #if defined(HAVE_SECURE_RENEGOTIATION) && defined(HAVE_TLS_EXTENSIONS)
if (ssl->secureR_state.enabled) { if (ssl->secureR_state.enabled) {
if (ssl->options.side == CYASSL_CLIENT_END) if (ssl->options.side == CYASSL_CLIENT_END)
XMEMCPY(ssl->secureR_state.client_verify_data, hashes, XMEMCPY(ssl->secureR_state.client_verify_data, hashes,
@@ -6741,7 +6741,7 @@ int SendFinished(CYASSL* ssl)
XMEMCPY(ssl->secureR_state.server_verify_data, hashes, XMEMCPY(ssl->secureR_state.server_verify_data, hashes,
TLS_FINISHED_SZ); TLS_FINISHED_SZ);
} }
#endif /* HAVE_SECURE_RENEGOTIATION */ #endif /* HAVE_SECURE_RENEGOTIATION && HAVE_TLS_EXTENSIONS */
sendSz = BuildMessage(ssl, output, outputSz, input, headerSz + finishedSz, sendSz = BuildMessage(ssl, output, outputSz, input, headerSz + finishedSz,
handshake); handshake);