arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-21 10:26:06 +03:00
Code

changed test for ssl_renegotiation failure

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/axtls/code/trunk@173 9a5d90b5-6617-0410-8a86-bb477d3ed2e3
This commit is contained in:
cameronrich 2010-05-09 09:18:03 +00:00
parent e686f3b6c6
commit 92b07bc18d
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ssl/test/ssltest.c
View File

@ -1352,7 +1352,7 @@ static int SSL_client_test(
/* renegotiate client */ /* renegotiate client */
if (sess_resume && sess_resume->do_reneg) if (sess_resume && sess_resume->do_reneg)
{ {
if (ssl_renegotiate(ssl) < 0) if ((ret = ssl_renegotiate(ssl)) < 0)
goto client_test_exit; goto client_test_exit;
} }
@ -1451,12 +1451,16 @@ int SSL_client_tests(void)
// no client renegotiation // no client renegotiation
// TODO: this was causing a lock-up on x509_free() // TODO: this was causing a lock-up on x509_free()
// sess_resume.do_reneg = 1; sess_resume.do_reneg = 1;
// if ((ret = SSL_client_test("Client renegotiation", if ((ret = SSL_client_test("Client renegotiation",
// &ssl_ctx, NULL, &sess_resume, &ssl_ctx, NULL, &sess_resume,
// DEFAULT_CLNT_OPTION, NULL, NULL, NULL))) DEFAULT_CLNT_OPTION, NULL, NULL, NULL)) !=
// goto cleanup; -SSL_ALERT_NO_RENEGOTIATION)
// sess_resume.do_reneg = 0; {
printf("*** Error: %d\n", ret); TTY_FLUSH();
goto cleanup;
}
sess_resume.do_reneg = 0;
sess_resume.stop_server = 1; sess_resume.stop_server = 1;
if ((ret = SSL_client_test("Client session resumption #2", if ((ret = SSL_client_test("Client session resumption #2",
@ -1527,7 +1531,7 @@ int SSL_client_tests(void)
DEFAULT_CLNT_OPTION|SSL_SERVER_VERIFY_LATER, NULL, DEFAULT_CLNT_OPTION|SSL_SERVER_VERIFY_LATER, NULL,
NULL, NULL)) != SSL_X509_ERROR(X509_VFY_ERROR_EXPIRED)) NULL, NULL)) != SSL_X509_ERROR(X509_VFY_ERROR_EXPIRED))
{ {
printf("*** Error: %d\n", ret); printf("*** Error: %d\n", ret); TTY_FLUSH();
goto cleanup; goto cleanup;
} }

1
ssl/x509.c
View File

@ -252,7 +252,6 @@ void x509_free(X509_CTX *x509_ctx)
#endif #endif
RSA_free(x509_ctx->rsa_ctx); RSA_free(x509_ctx->rsa_ctx);
next = x509_ctx->next; next = x509_ctx->next;
free(x509_ctx); free(x509_ctx);
x509_free(next); /* clear the chain */ x509_free(next); /* clear the chain */