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

add sanity check on send callback sent value

Browse Source
This commit is contained in:
toddouska
2014-06-09 12:55:17 -07:00
parent 257959bcde
commit e0c5c89bf6
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cyassl/error-ssl.h
View File

@@ -114,10 +114,11 @@ enum CyaSSL_ErrorCodes {
CACHE_MATCH_ERROR = -280, /* chache hdr match error */ CACHE_MATCH_ERROR = -280, /* chache hdr match error */
UNKNOWN_SNI_HOST_NAME_E = -281, /* Unrecognized host name Error */ UNKNOWN_SNI_HOST_NAME_E = -281, /* Unrecognized host name Error */
UNKNOWN_MAX_FRAG_LEN_E = -282, /* Unrecognized max frag len Error */ UNKNOWN_MAX_FRAG_LEN_E = -282, /* Unrecognized max frag len Error */
/* add strings to SetErrorString !!!!! */
KEYUSE_SIGNATURE_E = -283, /* KeyUse digSignature error */ KEYUSE_SIGNATURE_E = -283, /* KeyUse digSignature error */
KEYUSE_ENCIPHER_E = -285, /* KeyUse keyEncipher error */ KEYUSE_ENCIPHER_E = -285, /* KeyUse keyEncipher error */
EXTKEYUSE_AUTH_E = -286, /* ExtKeyUse server|client_auth */ EXTKEYUSE_AUTH_E = -286, /* ExtKeyUse server|client_auth */
SEND_OOB_READ_E = -287, /* Send Cb out of bounds read */
/* add strings to SetErrorString !!!!! */
/* begin negotiation parameter errors */ /* begin negotiation parameter errors */
UNSUPPORTED_SUITE = -290, /* unsupported cipher suite */ UNSUPPORTED_SUITE = -290, /* unsupported cipher suite */

8
src/internal.c
View File

@@ -2780,6 +2780,11 @@ int SendBuffered(CYASSL* ssl)
return SOCKET_ERROR_E; return SOCKET_ERROR_E;
} }
if (sent > (int)ssl->buffers.outputBuffer.length) {
CYASSL_MSG("SendBuffered() out of bounds read");
return SEND_OOB_READ_E;
}
ssl->buffers.outputBuffer.idx += sent; ssl->buffers.outputBuffer.idx += sent;
ssl->buffers.outputBuffer.length -= sent; ssl->buffers.outputBuffer.length -= sent;
} }
@@ -6596,6 +6601,9 @@ const char* CyaSSL_ERR_reason_error_string(unsigned long e)
case EXTKEYUSE_AUTH_E: case EXTKEYUSE_AUTH_E:
return "Ext Key Use server/client auth not set Error"; return "Ext Key Use server/client auth not set Error";
case SEND_OOB_READ_E:
return "Send Callback Out of Bounds Read Error";
default : default :
return "unknown error number"; return "unknown error number";
} }