Overview
Comment: | Removed backwards compatibility hacks and much reformatting |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
f087e1fe61dd7021d373beea1bceda8a |
User & Date: | rkeene on 2016-12-10 02:55:12 |
Other Links: | manifest | tags |
Context
2016-12-10
| ||
04:29 | Minor whitespace cleanup check-in: 88815cbc52 user: rkeene tags: trunk | |
02:55 | Removed backwards compatibility hacks and much reformatting check-in: f087e1fe61 user: rkeene tags: trunk | |
01:43 | Reformatted BIO code check-in: c34f472c39 user: rkeene tags: trunk | |
Changes
Modified tls.c
from [a1d0fac62c]
to [ae2cba46b1].
︙ | |||
78 79 80 81 82 83 84 | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | - - - - - - | * Static data structures */ #ifndef OPENSSL_NO_DH #include "dh_params.h" #endif |
︙ | |||
626 627 628 629 630 631 632 | 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 | - - - - - + + + + + - | return TCL_ERROR; } chan = Tcl_GetChannel(interp, Tcl_GetStringFromObj(objv[1], NULL), NULL); if (chan == (Tcl_Channel) NULL) { return TCL_ERROR; } |
︙ | |||
749 750 751 752 753 754 755 | 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 | - - - - - + + + + + - | return TCL_ERROR; } chan = Tcl_GetChannel(interp, Tcl_GetStringFromObj(objv[1], NULL), NULL); if (chan == (Tcl_Channel) NULL) { return TCL_ERROR; } |
︙ | |||
841 842 843 844 845 846 847 | 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 | - - - - - + + + + + - | int mode; /* Get the "model" context */ chan = Tcl_GetChannel(interp, model, &mode); if (chan == (Tcl_Channel) NULL) { Tls_Free((char *) statePtr); return TCL_ERROR; } |
︙ | |||
871 872 873 874 875 876 877 | 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 | - - - - - - + - - - - - - | /* * We need to make sure that the channel works in binary (for the * encryption not to get goofed up). * We only want to adjust the buffering in pre-v2 channels, where * each channel in the stack maintained its own buffers. */ Tcl_SetChannelOption(interp, chan, "-translation", "binary"); |
︙ | |||
981 982 983 984 985 986 987 | 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 | - - - - - + + + + - | } chan = Tcl_GetChannel(interp, Tcl_GetString(objv[1]), NULL); if (chan == (Tcl_Channel) NULL) { return TCL_ERROR; } |
︙ | |||
1302 1303 1304 1305 1306 1307 1308 | 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 | - - - - - + + + + - | return TCL_ERROR; } chan = Tcl_GetChannel(interp, channelName, &mode); if (chan == (Tcl_Channel) NULL) { return TCL_ERROR; } |
︙ | |||
1639 1640 1641 1642 1643 1644 1645 | 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 | - - - - + - + - + - - - - - - - - - - - - - - - - + - - - + - - - + - - - + - - - + - - - + - - - + - | const char tlsTclInitScript[] = { #include "tls.tcl.h" }; int major, minor, patchlevel, release; /* |
︙ |
Modified tlsBIO.c
from [7f72e998da]
to [504969653b].
︙ | |||
67 68 69 70 71 72 73 | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | - - + - - - | Tcl_Channel chan; int ret; chan = Tls_GetParent((State *) BIO_get_data(bio)); dprintf("BioWrite(%p, <buf>, %d) [%p]", (void *) bio, bufLen, (void *) chan); |
︙ | |||
104 105 106 107 108 109 110 | 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 | - - + - - - - + | dprintf("BioRead(%p, <buf>, %d) [%p]", (void *) bio, bufLen, (void *) chan); if (buf == NULL) { return 0; } |
︙ | |||
153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 | + + + + + + - + + + + - + - - + - - - + | chan = Tls_GetParent((State *) BIO_get_data(bio)); dprintf("BioCtrl(%p, 0x%x, 0x%x, %p)", (void *) bio, (unsigned int) cmd, (unsigned int) num, (void *) ptr); switch (cmd) { case BIO_CTRL_RESET: dprintf("Got BIO_CTRL_RESET"); num = 0; case BIO_C_FILE_SEEK: dprintf("Got BIO_C_FILE_SEEK"); case BIO_C_FILE_TELL: dprintf("Got BIO_C_FILE_TELL"); ret = 0; break; case BIO_CTRL_INFO: dprintf("Got BIO_CTRL_INFO"); ret = 1; break; case BIO_C_SET_FD: dprintf("Unsupported call: BIO_C_SET_FD"); ret = -1; break; case BIO_C_GET_FD: dprintf("Unsupported call: BIO_C_GET_FD"); ret = -1; break; case BIO_CTRL_GET_CLOSE: dprintf("Got BIO_CTRL_CLOSE"); ret = BIO_get_shutdown(bio); break; case BIO_CTRL_SET_CLOSE: dprintf("Got BIO_SET_CLOSE"); BIO_set_shutdown(bio, num); break; case BIO_CTRL_EOF: |
︙ |
Modified tlsIO.c
from [638f98d4e0]
to [c5a7b3dcc1].
︙ | |||
18 19 20 21 22 23 24 | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 | - - + - - - - - + + - - + - - + - - + - - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - + + - - - - + + + + - - - - - - - + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + - - - - - - - - - - - - - + + + + + - - - - + + + - - - + + - + - - - + - - - - - + - - - - - - - + + + + + + + - - - - - + + - | */ #include "tlsInt.h" /* * Forward declarations */ |
︙ | |||
282 283 284 285 286 287 288 | 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 | - - - - - - - - - - - + | TlsCloseProc(ClientData instanceData, /* The socket to close. */ Tcl_Interp *interp) /* For error reporting - unused. */ { State *statePtr = (State *) instanceData; dprintf("TlsCloseProc(%p)", (void *) statePtr); |
︙ | |||
394 395 396 397 398 399 400 | 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 | - + | } } } input: dprintf("Input(%d) -> %d [%d]", bufSize, bytesRead, *errorCodePtr); return bytesRead; } |
︙ | |||
507 508 509 510 511 512 513 | 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 | - + | break; } } output: dprintf("Output(%d) -> %d", toWrite, written); return written; } |
︙ | |||
538 539 540 541 542 543 544 | 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 | - - - + + - - - + + + - - - - - - - - - - - + + + + + + + + + + - - - - + - - - + - - - - - - - - - - - - - - - | * NULL to get all options and * their values. */ Tcl_DString *dsPtr) /* Where to store the computed value * initialized by caller. */ { State *statePtr = (State *) instanceData; |
︙ | |||
601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 | 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 | + - - - | static void TlsWatchProc(ClientData instanceData, /* The socket state. */ int mask) /* Events of interest; an OR-ed * combination of TCL_READABLE, * TCL_WRITABLE and TCL_EXCEPTION. */ { Tcl_Channel downChan; State *statePtr = (State *) instanceData; dprintf("TlsWatchProc(0x%x)", mask); /* Pretend to be dead as long as the verify callback is running. * Otherwise that callback could be invoked recursively. */ if (statePtr->flags & TLS_TCL_CALLBACK) { return; } |
︙ | |||
643 644 645 646 647 648 649 | 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 | - - - - + - - - - - - - - - - - - - - - - - - - - - | /* * There is interest in readable events and we actually have * data waiting, so generate a timer to flush that. */ statePtr->timer = Tcl_CreateTimerHandler(TLS_TCL_DELAY, TlsChannelHandlerTimer, (ClientData) statePtr); } |
︙ | |||
694 695 696 697 698 699 700 | 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 | - + | int direction, /* Which Tcl_File to retrieve? */ ClientData *handlePtr) /* Where to store the handle. */ { State *statePtr = (State *) instanceData; return Tcl_GetChannelHandle(Tls_GetParent(statePtr), direction, handlePtr); } |
︙ | |||
747 748 749 750 751 752 753 | 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 | - - - + + + + + + + + - + + | return 0; } if ((statePtr->flags & TLS_TCL_INIT) && !SSL_is_init_finished(statePtr->ssl)) { int errorCode = 0; dprintf("Calling Tls_WaitForConnect"); |
︙ | |||
837 838 839 840 841 842 843 | 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 | + - + | * Data is waiting, flush it out in short time */ statePtr->timer = Tcl_CreateTimerHandler(TLS_TCL_DELAY, TlsChannelHandlerTimer, (ClientData) statePtr); } Tcl_Release( (ClientData)statePtr); } #endif |
︙ | |||
874 875 876 877 878 879 880 | 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 | - + - - - + - - | mask |= TCL_WRITABLE; } if (BIO_pending(statePtr->bio)) { mask |= TCL_READABLE; } Tcl_NotifyChannel(statePtr->self, mask); } |
︙ | |||
981 982 983 984 985 986 987 | 808 809 810 811 812 813 814 815 816 817 818 819 | - - + + - - + - - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - | return -1; } dprintf("R0! "); return 1; } } |
Modified tlsInt.h
from [b4a76786cc]
to [3805fea315].
︙ | |||
130 131 132 133 134 135 136 | 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - + + + + + - - + | SSL_CTX *ctx; /* SSL Context */ BIO *bio; /* Struct for SSL processing */ BIO *p_bio; /* Parent BIO (that is layered on Tcl_Channel) */ char *err; } State; |