wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3408 from ejohnstown/opt-fix

Browse Source 
Example Client OCSP Option Fix
This commit is contained in:
David Garske
2020-10-22 09:00:04 -07:00
committed by GitHub
parent e4eda3e125 e28303b40a
commit f75dc4727d
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/client/client.c
View File

@ -1944,15 +1944,21 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
case 'W' : case 'W' :
#if defined(HAVE_CERTIFICATE_STATUS_REQUEST) \ #if defined(HAVE_CERTIFICATE_STATUS_REQUEST) \
|| defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2) || defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2)
{
word32 myoptargSz;
statusRequest = atoi(myoptarg); statusRequest = atoi(myoptarg);
if (statusRequest > OCSP_STAPLING_OPT_MAX) { if (statusRequest > OCSP_STAPLING_OPT_MAX) {
Usage(); Usage();
XEXIT_T(MY_EX_USAGE); XEXIT_T(MY_EX_USAGE);
} }
if (myoptarg[XSTRLEN(myoptarg)-1] == 'M' ||
myoptarg[XSTRLEN(myoptarg)-1] == 'm') { myoptargSz = (word32)XSTRLEN(myoptarg);
if (myoptargSz > 0 &&
XTOUPPER(myoptarg[myoptargSz-1]) == 'M') {
mustStaple = 1; mustStaple = 1;
} }
}
#endif #endif
break; break;

11
src/internal.c
View File

@ -21330,17 +21330,6 @@ static int GetDhPublicKey(WOLFSSL* ssl, const byte* input, word32 size,
ERROR_OUT(BUFFER_ERROR, exit_gdpk); ERROR_OUT(BUFFER_ERROR, exit_gdpk);
} }
if (length < ssl->options.minDhKeySz) {
WOLFSSL_MSG("Server using a public DH key that is too small");
SendAlert(ssl, alert_fatal, handshake_failure);
XFREE(ssl->buffers.serverDH_P.buffer, ssl->heap,
DYNAMIC_TYPE_PUBLIC_KEY);
ssl->buffers.serverDH_P.buffer = NULL;
XFREE(ssl->buffers.serverDH_G.buffer, ssl->heap,
DYNAMIC_TYPE_PUBLIC_KEY);
ssl->buffers.serverDH_G.buffer = NULL;
ERROR_OUT(DH_KEY_SIZE_E, exit_gdpk);
}
if (length > ssl->options.maxDhKeySz) { if (length > ssl->options.maxDhKeySz) {
WOLFSSL_MSG("Server using a public DH key that is too big"); WOLFSSL_MSG("Server using a public DH key that is too big");
SendAlert(ssl, alert_fatal, handshake_failure); SendAlert(ssl, alert_fatal, handshake_failure);