Overview
Comment: | Added back option to enable debug mode that was lost in conversion to new TEA build system |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | tls-1.8 |
Files: | files | file ages | folders |
SHA3-256: |
7e60e66f641cb2f1b8c501002109da2b |
User & Date: | bohagan on 2024-06-06 05:20:37 |
Other Links: | branch diff | manifest | tags |
Context
2024-06-06
| ||
13:20 | Removed debugging item not meant for commit. check-in: 9fbb04d340 user: bohagan tags: tls-1.8 | |
05:20 | Added back option to enable debug mode that was lost in conversion to new TEA build system check-in: 7e60e66f64 user: bohagan tags: tls-1.8 | |
00:47 | Added back option to enable debug mode that was lost in conversion to new TEA build system check-in: 73be06fc48 user: bohagan tags: tls-1.8 | |
Changes
Modified generic/tls.c
from [b933816499]
to [ec7ae85081].
︙ | |||
160 161 162 163 164 165 166 | 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 | - + + | State *statePtr = (State*)SSL_get_app_data((SSL *)ssl); Tcl_Interp *interp = statePtr->interp; Tcl_Obj *cmdPtr; const char *major, *minor; dprintf("Called"); |
︙ | |||
235 236 237 238 239 240 241 | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 | - + + | char *ver, *type; BIO *bio; char buffer[15000]; buffer[0] = 0; dprintf("Called"); |
︙ | |||
307 308 309 310 311 312 313 314 315 316 317 318 319 320 | 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 | + + | SSL_trace(write_p, version, content_type, buf, len, ssl, (void *)bio); n = BIO_read(bio, buffer, BIO_pending(bio) < 15000 ? BIO_pending(bio) : 14999); n = (n<0) ? 0 : n; buffer[n] = 0; (void)BIO_flush(bio); BIO_free(bio); } dprintf("Message direction=%d, ver=%s, type=%s, message=%s", write_p, ver, type, &buffer[0]); /* Create command to eval with fn, chan, direction, version, type, and message args */ cmdPtr = Tcl_DuplicateObj(statePtr->callback); Tcl_ListObjAppendElement(interp, cmdPtr, Tcl_NewStringObj("message", -1)); Tcl_ListObjAppendElement(interp, cmdPtr, Tcl_NewStringObj(Tcl_GetChannelName(statePtr->self), -1)); Tcl_ListObjAppendElement(interp, cmdPtr, Tcl_NewStringObj(write_p ? "Sent" : "Received", -1)); |
︙ | |||
431 432 433 434 435 436 437 | 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 | - + - + + | void Tls_Error(State *statePtr, const char *msg) { Tcl_Interp *interp = statePtr->interp; Tcl_Obj *cmdPtr, *listPtr; unsigned long err; statePtr->err = msg; |
︙ |
Modified generic/tlsIO.c
from [b64377d99a]
to [9b0361f2c0].
︙ | |||
358 359 360 361 362 363 364 365 366 367 368 369 370 371 | 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 | + | *errorCodePtr = EAGAIN; } } #endif switch (err) { case SSL_ERROR_NONE: dprintf("SSL_ERROR_NONE"); dprintBuffer(buf, bytesRead); break; case SSL_ERROR_SSL: /* A non-recoverable, fatal error in the SSL library occurred, usually a protocol error */ dprintf("SSL error, indicating that the connection has been aborted"); if (backingError != 0) { |
︙ | |||
387 388 389 390 391 392 393 394 395 396 397 398 399 400 | 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 | + | Tls_Error(statePtr, "EOF reached"); } #endif break; case SSL_ERROR_SYSCALL: /* Some non-recoverable, fatal I/O error occurred */ dprintf("SSL_ERROR_SYSCALL"); if (backingError == 0 && bytesRead == 0) { /* Unexpected EOF from the peer for OpenSSL 1.1 */ dprintf("(Unexpected) EOF reached") *errorCodePtr = 0; bytesRead = 0; Tls_Error(statePtr, "EOF reached"); |
︙ | |||
524 525 526 527 528 529 530 531 532 533 534 535 536 537 | 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 | + | dprintf("BIO_write(%p, %d) -> [%d]", (void *) statePtr, toWrite, written); err = SSL_get_error(statePtr->ssl, written); backingError = ERR_get_error(); switch (err) { case SSL_ERROR_NONE: dprintf("SSL_ERROR_NONE"); if (written < 0) { written = 0; } break; case SSL_ERROR_WANT_WRITE: dprintf("Got SSL_ERROR_WANT_WRITE, mapping it to EAGAIN"); |
︙ | |||
555 556 557 558 559 560 561 562 563 564 565 566 567 568 | 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 | + | written = 0; *errorCodePtr = 0; Tls_Error(statePtr, "Peer has closed the connection for writing by sending the close_notify alert"); break; case SSL_ERROR_SYSCALL: /* Some non-recoverable, fatal I/O error occurred */ dprintf("SSL_ERROR_SYSCALL"); if (backingError == 0 && written == 0) { dprintf("EOF reached") *errorCodePtr = 0; written = 0; Tls_Error(statePtr, "EOF reached"); |
︙ | |||
624 625 626 627 628 629 630 | 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 | - + + | TlsSetOptionProc(ClientData instanceData, /* Socket state. */ Tcl_Interp *interp, /* For errors - can be NULL. */ const char *optionName, /* Name of the option to set the value for, or * NULL to get all options and their values. */ const char *optionValue) /* Value for option. */ { State *statePtr = (State *) instanceData; |
︙ | |||
669 670 671 672 673 674 675 | 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 | - + + | TlsGetOptionProc(ClientData instanceData, /* Socket state. */ Tcl_Interp *interp, /* For errors - can be NULL. */ const char *optionName, /* Name of the option to retrieve the value for, or * NULL to get all options and their values. */ Tcl_DString *optionValue) /* Where to store the computed value initialized by caller. */ { State *statePtr = (State *) instanceData; |
︙ | |||
817 818 819 820 821 822 823 824 825 826 827 828 829 830 | 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 | + + | */ static int TlsNotifyProc(ClientData instanceData, /* Socket state. */ int mask) /* type of event that occurred: * OR-ed combination of TCL_READABLE or TCL_WRITABLE */ { State *statePtr = (State *) instanceData; int errorCode; dprintf("Called"); /* * An event occurred in the underlying channel. This * transformation doesn't process such events thus returns the * incoming mask unchanged. */ if (statePtr->timer != (Tcl_TimerToken) NULL) { |
︙ |