Overview
Comment: | Merge tls-1.7 |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | nijtmans |
Files: | files | file ages | folders |
SHA3-256: |
8e0be2f6e9033d83549e53f6ddedac7a |
User & Date: | jan.nijtmans on 2024-02-19 20:16:57 |
Other Links: | branch diff | manifest | tags |
Context
2024-02-19
| ||
21:55 | Less compiler warnings check-in: 0cfe6dfb3c user: jan.nijtmans tags: nijtmans | |
20:16 | Merge tls-1.7 check-in: 8e0be2f6e9 user: jan.nijtmans tags: nijtmans | |
19:23 | No need to allocate a Tcl_ChannelType Leaf check-in: 7af51313f8 user: jan.nijtmans tags: tls-1.7 | |
2024-02-16
| ||
13:54 | Merge 1.7 check-in: b8b1970122 user: jan.nijtmans tags: nijtmans | |
Changes
Modified tests/oldTests/tlsHttp.tcl from [a53b6ea2fa] to [9ac8651bfa].
whitespace changes only
Modified tls.c from [484811ec37] to [5ad13a5c03].
︙ | ︙ | |||
919 920 921 922 923 924 925 | Tcl_GetChannelOption(interp, chan, "-eofchar", &upperChannelEOFChar); Tcl_GetChannelOption(interp, chan, "-encoding", &upperChannelEncoding); Tcl_GetChannelOption(interp, chan, "-translation", &upperChannelTranslation); Tcl_GetChannelOption(interp, chan, "-blocking", &upperChannelBlocking); Tcl_SetChannelOption(interp, chan, "-translation", "binary"); Tcl_SetChannelOption(interp, chan, "-blocking", "true"); dprintf("Consuming Tcl channel %s", Tcl_GetChannelName(chan)); | | | 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 | Tcl_GetChannelOption(interp, chan, "-eofchar", &upperChannelEOFChar); Tcl_GetChannelOption(interp, chan, "-encoding", &upperChannelEncoding); Tcl_GetChannelOption(interp, chan, "-translation", &upperChannelTranslation); Tcl_GetChannelOption(interp, chan, "-blocking", &upperChannelBlocking); Tcl_SetChannelOption(interp, chan, "-translation", "binary"); Tcl_SetChannelOption(interp, chan, "-blocking", "true"); dprintf("Consuming Tcl channel %s", Tcl_GetChannelName(chan)); statePtr->self = Tcl_StackChannel(interp, Tls_ChannelType(), statePtr, (TCL_READABLE | TCL_WRITABLE), chan); dprintf("Created channel named %s", Tcl_GetChannelName(statePtr->self)); if (statePtr->self == (Tcl_Channel) NULL) { /* * No use of Tcl_EventuallyFree because no possible Tcl_Preserve. */ Tls_Free((char *) statePtr); return TCL_ERROR; |
︙ | ︙ |
Modified tlsIO.c from [7766a5b5ba] to [b6449e1f3f].
︙ | ︙ | |||
26 27 28 29 30 31 32 | static int TlsCloseProc (ClientData instanceData, Tcl_Interp *interp); static int TlsInputProc (ClientData instanceData, char *buf, int bufSize, int *errorCodePtr); static int TlsOutputProc (ClientData instanceData, const char *buf, int toWrite, int *errorCodePtr); static int TlsGetOptionProc (ClientData instanceData, Tcl_Interp *interp, const char *optionName, Tcl_DString *dsPtr); static void TlsWatchProc (ClientData instanceData, int mask); static int TlsGetHandleProc (ClientData instanceData, int direction, ClientData *handlePtr); static int TlsNotifyProc (ClientData instanceData, int mask); | < < < | > > > > > > > > > > > > > > > > | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | 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 | static int TlsCloseProc (ClientData instanceData, Tcl_Interp *interp); static int TlsInputProc (ClientData instanceData, char *buf, int bufSize, int *errorCodePtr); static int TlsOutputProc (ClientData instanceData, const char *buf, int toWrite, int *errorCodePtr); static int TlsGetOptionProc (ClientData instanceData, Tcl_Interp *interp, const char *optionName, Tcl_DString *dsPtr); static void TlsWatchProc (ClientData instanceData, int mask); static int TlsGetHandleProc (ClientData instanceData, int direction, ClientData *handlePtr); static int TlsNotifyProc (ClientData instanceData, int mask); static void TlsChannelHandlerTimer (ClientData clientData); /* * TLS Channel Type */ static const Tcl_ChannelType tlsChannelType = { "tls", /* typeName */ TCL_CHANNEL_VERSION_5, /* version */ TlsCloseProc, /* closeProc */ TlsInputProc, /* inputProc */ TlsOutputProc, /* outputProc */ 0, /* seekProc */ 0, /* setOptionProc */ TlsGetOptionProc, /* getOptionProc */ TlsWatchProc, /* watchProc */ TlsGetHandleProc, /* getHandleProc */ NULL, /* close2Proc */ TlsBlockModeProc, /* blockModeProc */ 0, /* flushProc */ TlsNotifyProc /* handlerProc */ }; /* *------------------------------------------------------------------- * * Tls_ChannelType -- * * Return the correct TLS channel driver info * * Results: * The correct channel driver for the current version of Tcl. * * Side effects: * None. * *------------------------------------------------------------------- */ const Tcl_ChannelType *Tls_ChannelType(void) { return &tlsChannelType; } /* *------------------------------------------------------------------- * * TlsBlockModeProc -- * |
︙ | ︙ |
Modified tlsInt.h from [87cfb18add] to [a4d43feb33].
︙ | ︙ | |||
155 156 157 158 159 160 161 | #error "Unable to compile on this version of Tcl" #endif /* Tcl_GetStackedChannel */ #endif /* USE_TCL_STUBS */ /* * Forward declarations */ | | | 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 | #error "Unable to compile on this version of Tcl" #endif /* Tcl_GetStackedChannel */ #endif /* USE_TCL_STUBS */ /* * Forward declarations */ const Tcl_ChannelType *Tls_ChannelType(void); Tcl_Channel Tls_GetParent(State *statePtr, int maskFlags); Tcl_Obj *Tls_NewX509Obj(Tcl_Interp *interp, X509 *cert); void Tls_Error(State *statePtr, char *msg); void Tls_Free(char *blockPtr); void Tls_Clean(State *statePtr); int Tls_WaitForConnect(State *statePtr, int *errorCodePtr, int handshakeFailureIsPermanent); |
︙ | ︙ |