feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #5492 from embhorn/zd14694

Browse Source 
Fix for AddPacketInfo with WOLFSSL_CALLBACKS
This commit is contained in:
JacobBarthelmeh
2022-08-22 14:59:29 -06:00
committed by GitHub
parent c7c6fd98d7 22c44bd762
commit bd49d37aaf
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/internal.c
View File

@ -24681,7 +24681,8 @@ int PickHashSigAlgo(WOLFSSL* ssl, const byte* hashSigAlgo, word32 hashSigAlgoSz)
} }
#endif /* WOLFSSL_CALLBACKS */ #endif /* WOLFSSL_CALLBACKS */
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
if (ssl->protoMsgCb != NULL && sz > RECORD_HEADER_SZ) { if ((ssl->protoMsgCb != NULL) && (sz > RECORD_HEADER_SZ) &&
(ssl->keys.encryptionOn != 1)) {
/* version from hex to dec 16 is 16^1, 256 from 16^2 and /* version from hex to dec 16 is 16^1, 256 from 16^2 and
4096 from 16^3 */ 4096 from 16^3 */
int version = (ssl->version.minor & 0x0F) + int version = (ssl->version.minor & 0x0F) +

18
src/tls13.c
View File

@ -3672,7 +3672,7 @@ int SendTls13ClientHello(WOLFSSL* ssl)
ssl->options.clientState = CLIENT_HELLO_COMPLETE; ssl->options.clientState = CLIENT_HELLO_COMPLETE;
#ifdef WOLFSSL_CALLBACKS #if defined(WOLFSSL_CALLBACKS) || defined(OPENSSL_EXTRA)
if (ssl->hsInfoOn) AddPacketName(ssl, "ClientHello"); if (ssl->hsInfoOn) AddPacketName(ssl, "ClientHello");
if (ssl->toInfoOn) { if (ssl->toInfoOn) {
AddPacketInfo(ssl, "ClientHello", handshake, args->output, args->sendSz, AddPacketInfo(ssl, "ClientHello", handshake, args->output, args->sendSz,
@ -5854,7 +5854,7 @@ int SendTls13ServerHello(WOLFSSL* ssl, byte extMsgType)
if (ret != 0) if (ret != 0)
return ret; return ret;
#ifdef WOLFSSL_CALLBACKS #if defined(WOLFSSL_CALLBACKS) || defined(OPENSSL_EXTRA)
if (ssl->hsInfoOn) if (ssl->hsInfoOn)
AddPacketName(ssl, "ServerHello"); AddPacketName(ssl, "ServerHello");
if (ssl->toInfoOn) { if (ssl->toInfoOn) {
@ -5998,7 +5998,7 @@ static int SendTls13EncryptedExtensions(WOLFSSL* ssl)
return ret; return ret;
idx += length; idx += length;
#ifdef WOLFSSL_CALLBACKS #if defined(WOLFSSL_CALLBACKS) || defined(OPENSSL_EXTRA)
if (ssl->hsInfoOn) if (ssl->hsInfoOn)
AddPacketName(ssl, "EncryptedExtensions"); AddPacketName(ssl, "EncryptedExtensions");
if (ssl->toInfoOn) { if (ssl->toInfoOn) {
@ -6138,7 +6138,7 @@ static int SendTls13CertificateRequest(WOLFSSL* ssl, byte* reqCtx,
if (sendSz < 0) if (sendSz < 0)
return sendSz; return sendSz;
#ifdef WOLFSSL_CALLBACKS #if defined(WOLFSSL_CALLBACKS) || defined(OPENSSL_EXTRA)
if (ssl->hsInfoOn) if (ssl->hsInfoOn)
AddPacketName(ssl, "CertificateRequest"); AddPacketName(ssl, "CertificateRequest");
if (ssl->toInfoOn) { if (ssl->toInfoOn) {
@ -6944,7 +6944,7 @@ static int SendTls13Certificate(WOLFSSL* ssl)
if (sendSz < 0) if (sendSz < 0)
return sendSz; return sendSz;
#ifdef WOLFSSL_CALLBACKS #if defined(WOLFSSL_CALLBACKS) || defined(OPENSSL_EXTRA)
if (ssl->hsInfoOn) if (ssl->hsInfoOn)
AddPacketName(ssl, "Certificate"); AddPacketName(ssl, "Certificate");
if (ssl->toInfoOn) { if (ssl->toInfoOn) {
@ -7479,7 +7479,7 @@ static int SendTls13CertificateVerify(WOLFSSL* ssl)
ret = 0; ret = 0;
} }
#ifdef WOLFSSL_CALLBACKS #if defined(WOLFSSL_CALLBACKS) || defined(OPENSSL_EXTRA)
if (ssl->hsInfoOn) if (ssl->hsInfoOn)
AddPacketName(ssl, "CertificateVerify"); AddPacketName(ssl, "CertificateVerify");
if (ssl->toInfoOn) { if (ssl->toInfoOn) {
@ -8399,7 +8399,7 @@ static int SendTls13Finished(WOLFSSL* ssl)
return BUILD_MSG_ERROR; return BUILD_MSG_ERROR;
} }
#ifdef WOLFSSL_CALLBACKS #if defined(WOLFSSL_CALLBACKS) || defined(OPENSSL_EXTRA)
if (ssl->hsInfoOn) AddPacketName(ssl, "Finished"); if (ssl->hsInfoOn) AddPacketName(ssl, "Finished");
if (ssl->toInfoOn) { if (ssl->toInfoOn) {
AddPacketInfo(ssl, "Finished", handshake, output, sendSz, AddPacketInfo(ssl, "Finished", handshake, output, sendSz,
@ -8607,7 +8607,7 @@ static int SendTls13KeyUpdate(WOLFSSL* ssl)
if (sendSz < 0) if (sendSz < 0)
return BUILD_MSG_ERROR; return BUILD_MSG_ERROR;
#ifdef WOLFSSL_CALLBACKS #if defined(WOLFSSL_CALLBACKS) || defined(OPENSSL_EXTRA)
if (ssl->hsInfoOn) AddPacketName(ssl, "KeyUpdate"); if (ssl->hsInfoOn) AddPacketName(ssl, "KeyUpdate");
if (ssl->toInfoOn) { if (ssl->toInfoOn) {
AddPacketInfo(ssl, "KeyUpdate", handshake, output, sendSz, AddPacketInfo(ssl, "KeyUpdate", handshake, output, sendSz,
@ -9735,7 +9735,7 @@ int DoTls13HandShakeMsgType(WOLFSSL* ssl, byte* input, word32* inOutIdx,
return ret; return ret;
} }
#ifdef WOLFSSL_CALLBACKS #if defined(WOLFSSL_CALLBACKS)
/* add name later, add on record and handshake header part back on */ /* add name later, add on record and handshake header part back on */
if (ssl->toInfoOn) { if (ssl->toInfoOn) {
int add = RECORD_HEADER_SZ + HANDSHAKE_HEADER_SZ; int add = RECORD_HEADER_SZ + HANDSHAKE_HEADER_SZ;