TclTLS
Check-in [50d8da007b]
Login
HomeTimelineDownloadBrowse SourceBranchesTagsTicketsWiki
Overview
Comment:Reverted [f79122ae17]
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 50d8da007b4ae9fce0f8f10a253e3ec3031eb190
User & Date: rkeene on 2016-12-13 15:29:19
Other Links: manifest | tags
Context
2016-12-13
15:43
Made repeated failures to handshake return fatal errors and made handshake code use the same logic as the rest of the OpenSSL read error checking check-in: 1b7959d27a user: rkeene tags: trunk
15:29
Reverted [f79122ae17] check-in: 50d8da007b user: rkeene tags: trunk
08:48
Updated to fatally fail if the handshake fatally fails check-in: f79122ae17 user: rkeene tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Modified tlsIO.c from [3765b3df61] to [cd83a9c489].
︙︙
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231

	}

	dprintf("Calling Tls_WaitForConnect");
	tlsConnect = Tls_WaitForConnect(statePtr, errorCodePtr);
	if (tlsConnect < 0) {
		dprintf("Got an error waiting to connect (tlsConnect = %i, *errorCodePtr = %i)", tlsConnect, *errorCodePtr);

		if (statePtr->flags & TLS_TCL_HANDSHAKE_FAILED) {
			dprintf("The handshake completely failed, returning in failure");
			return(-1);
		}

		bytesRead = -1;
		if (*errorCodePtr == ECONNRESET) {
			dprintf("Got connection reset");
			/* Soft EOF */
			*errorCodePtr = 0;
			bytesRead = 0;
		}








<
<
<
<
<








213
214
215
216
217
218
219





220
221
222
223
224
225
226

	}

	dprintf("Calling Tls_WaitForConnect");
	tlsConnect = Tls_WaitForConnect(statePtr, errorCodePtr);
	if (tlsConnect < 0) {
		dprintf("Got an error waiting to connect (tlsConnect = %i, *errorCodePtr = %i)", tlsConnect, *errorCodePtr);






		bytesRead = -1;
		if (*errorCodePtr == ECONNRESET) {
			dprintf("Got connection reset");
			/* Soft EOF */
			*errorCodePtr = 0;
			bytesRead = 0;
		}
︙︙
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360

	}

	dprintf("Calling Tls_WaitForConnect");
	tlsConnect = Tls_WaitForConnect(statePtr, errorCodePtr);
	if (tlsConnect < 0) {
		dprintf("Got an error waiting to connect (tlsConnect = %i, *errorCodePtr = %i)", tlsConnect, *errorCodePtr);

		if (statePtr->flags & TLS_TCL_HANDSHAKE_FAILED) {
			dprintf("The handshake completely failed, returning in failure");
			return(-1);
		}

		written = -1;
		if (*errorCodePtr == ECONNRESET) {
			dprintf("Got connection reset");
			/* Soft EOF */
			*errorCodePtr = 0;
			written = 0;
		}








<
<
<
<
<








337
338
339
340
341
342
343





344
345
346
347
348
349
350

	}

	dprintf("Calling Tls_WaitForConnect");
	tlsConnect = Tls_WaitForConnect(statePtr, errorCodePtr);
	if (tlsConnect < 0) {
		dprintf("Got an error waiting to connect (tlsConnect = %i, *errorCodePtr = %i)", tlsConnect, *errorCodePtr);






		written = -1;
		if (*errorCodePtr == ECONNRESET) {
			dprintf("Got connection reset");
			/* Soft EOF */
			*errorCodePtr = 0;
			written = 0;
		}
︙︙
Powered by Fossil · RSS