wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for AddPacketInfo with WOLFSSL_CALLBACKS

Browse Source
This commit is contained in:
Eric Blankenhorn
2022-08-22 08:01:21 -05:00
parent 969ad96dee
commit 22c44bd762
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

@@ -24693,7 +24693,8 @@ int PickHashSigAlgo(WOLFSSL* ssl, const byte* hashSigAlgo, word32 hashSigAlgoSz)
}
#endif /* WOLFSSL_CALLBACKS */
#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
4096 from 16^3 */
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;
#ifdef WOLFSSL_CALLBACKS
#if defined(WOLFSSL_CALLBACKS) || defined(OPENSSL_EXTRA)
if (ssl->hsInfoOn) AddPacketName(ssl, "ClientHello");
if (ssl->toInfoOn) {
AddPacketInfo(ssl, "ClientHello", handshake, args->output, args->sendSz,
@@ -5842,7 +5842,7 @@ int SendTls13ServerHello(WOLFSSL* ssl, byte extMsgType)
if (ret != 0)
return ret;
#ifdef WOLFSSL_CALLBACKS
#if defined(WOLFSSL_CALLBACKS) || defined(OPENSSL_EXTRA)
if (ssl->hsInfoOn)
AddPacketName(ssl, "ServerHello");
if (ssl->toInfoOn) {
@@ -5986,7 +5986,7 @@ static int SendTls13EncryptedExtensions(WOLFSSL* ssl)
return ret;
idx += length;
#ifdef WOLFSSL_CALLBACKS
#if defined(WOLFSSL_CALLBACKS) || defined(OPENSSL_EXTRA)
if (ssl->hsInfoOn)
AddPacketName(ssl, "EncryptedExtensions");
if (ssl->toInfoOn) {
@@ -6126,7 +6126,7 @@ static int SendTls13CertificateRequest(WOLFSSL* ssl, byte* reqCtx,
if (sendSz < 0)
return sendSz;
#ifdef WOLFSSL_CALLBACKS
#if defined(WOLFSSL_CALLBACKS) || defined(OPENSSL_EXTRA)
if (ssl->hsInfoOn)
AddPacketName(ssl, "CertificateRequest");
if (ssl->toInfoOn) {
@@ -6932,7 +6932,7 @@ static int SendTls13Certificate(WOLFSSL* ssl)
if (sendSz < 0)
return sendSz;
#ifdef WOLFSSL_CALLBACKS
#if defined(WOLFSSL_CALLBACKS) || defined(OPENSSL_EXTRA)
if (ssl->hsInfoOn)
AddPacketName(ssl, "Certificate");
if (ssl->toInfoOn) {
@@ -7467,7 +7467,7 @@ static int SendTls13CertificateVerify(WOLFSSL* ssl)
ret = 0;
}
#ifdef WOLFSSL_CALLBACKS
#if defined(WOLFSSL_CALLBACKS) || defined(OPENSSL_EXTRA)
if (ssl->hsInfoOn)
AddPacketName(ssl, "CertificateVerify");
if (ssl->toInfoOn) {
@@ -8387,7 +8387,7 @@ static int SendTls13Finished(WOLFSSL* ssl)
return BUILD_MSG_ERROR;
}
#ifdef WOLFSSL_CALLBACKS
#if defined(WOLFSSL_CALLBACKS) || defined(OPENSSL_EXTRA)
if (ssl->hsInfoOn) AddPacketName(ssl, "Finished");
if (ssl->toInfoOn) {
AddPacketInfo(ssl, "Finished", handshake, output, sendSz,
@@ -8595,7 +8595,7 @@ static int SendTls13KeyUpdate(WOLFSSL* ssl)
if (sendSz < 0)
return BUILD_MSG_ERROR;
#ifdef WOLFSSL_CALLBACKS
#if defined(WOLFSSL_CALLBACKS) || defined(OPENSSL_EXTRA)
if (ssl->hsInfoOn) AddPacketName(ssl, "KeyUpdate");
if (ssl->toInfoOn) {
AddPacketInfo(ssl, "KeyUpdate", handshake, output, sendSz,
@@ -9723,7 +9723,7 @@ int DoTls13HandShakeMsgType(WOLFSSL* ssl, byte* input, word32* inOutIdx,
return ret;
}
#ifdef WOLFSSL_CALLBACKS
#if defined(WOLFSSL_CALLBACKS)
/* add name later, add on record and handshake header part back on */
if (ssl->toInfoOn) {
int add = RECORD_HEADER_SZ + HANDSHAKE_HEADER_SZ;