Overview
Comment: | Merge trunk. tlsBIO.c is now fully equal to trunk. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | bohagan |
Files: | files | file ages | folders |
SHA3-256: |
dae8857d72b2d794e62994aca2fccadc |
User & Date: | jan.nijtmans on 2024-02-22 17:44:54 |
Other Links: | branch diff | manifest | tags |
Context
2024-02-22
| ||
17:51 | Merge trunk check-in: 0d2b96f6d8 user: jan.nijtmans tags: bohagan | |
17:44 | Merge trunk. tlsBIO.c is now fully equal to trunk. check-in: dae8857d72 user: jan.nijtmans tags: bohagan | |
17:40 | Fix [006bd0c74e]: PATCH: BIO_CTRL_PUSH not handled. Also add some changes from androwish: [https://www.androwish.org/home/info/982ebf9d31a60440] check-in: 1b8c76f783 user: jan.nijtmans tags: nijtmans | |
15:27 | Merge trunk check-in: c61ea12657 user: jan.nijtmans tags: bohagan | |
Changes
Modified generic/tlsBIO.c
from [e2553f33f8]
to [dd9500370d].
1 2 3 4 5 6 7 8 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 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 | + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + | /* * Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> * * Provides BIO layer to interface OpenSSL to Tcl. */ #include "tlsInt.h" #ifdef TCLTLS_OPENSSL_PRE_1_1_API #define BIO_get_data(bio) ((bio)->ptr) #define BIO_get_init(bio) ((bio)->init) #define BIO_get_shutdown(bio) ((bio)->shutdown) #define BIO_set_data(bio, val) (bio)->ptr = (val) #define BIO_set_init(bio, val) (bio)->init = (val) #define BIO_set_shutdown(bio, val) (bio)->shutdown = (val) |
︙ | |||
49 50 51 52 53 54 55 | 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | - + | if (ret != -1 || (ret == -1 && tclErrno == EAGAIN)) { if (BIO_should_read(bio)) { dprintf("Setting should retry read flag"); BIO_set_retry_read(bio); } } |
︙ | |||
72 73 74 75 76 77 78 | 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 | - + | ret = Tcl_ReadRaw(chan, buf, (Tcl_Size)bufLen); tclEofChan = Tcl_Eof(chan); tclErrno = Tcl_GetErrno(); dprintf("[chan=%p] BioRead(%d) -> %" TCL_SIZE_MODIFIER "d [tclEof=%d; tclErrno=%d]", |
︙ | |||
105 106 107 108 109 110 111 | 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 | - + | dprintf("Setting should retry write flag"); BIO_set_retry_write(bio); } } dprintf("BioRead(%p, <buf>, %d) [%p] returning %" TCL_SIZE_MODIFIER "d", |
︙ | |||
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 | 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 | + + + + + + + + | dprintf("Got BIO_CTRL_DUP"); break; case BIO_CTRL_FLUSH: dprintf("Got BIO_CTRL_FLUSH"); ret = ((chan) && (Tcl_WriteRaw(chan, "", 0) >= 0) ? 1 : -1); dprintf("BIO_CTRL_FLUSH returning value %li", ret); break; #ifdef BIO_CTRL_PUSH case BIO_CTRL_PUSH: dprintf("Got BIO_CTRL_PUSH"); ret = 0; break; #endif #ifdef BIO_CTRL_POP case BIO_CTRL_POP: dprintf("Got BIO_CTRL_POP"); ret = 0; break; #endif #ifdef BIO_CTRL_SET case BIO_CTRL_SET: dprintf("Got BIO_CTRL_SET"); ret = 0; break; #endif #ifdef BIO_CTRL_GET case BIO_CTRL_GET : dprintf("Got BIO_CTRL_GET "); ret = 0; break; #endif #ifdef BIO_CTRL_GET_KTLS_SEND case BIO_CTRL_GET_KTLS_SEND: dprintf("Got BIO_CTRL_GET_KTLS_SEND"); ret = 0; break; #endif #ifdef BIO_CTRL_GET_KTLS_RECV |
︙ | |||
242 243 244 245 246 247 248 | 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 | - + + + + | BIO_set_init(bio, 0); BIO_clear_flags(bio, -1); } return 1; } |
︙ | |||
282 283 284 285 286 287 288 | 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 | - + - + | * with the SSL library since it will likely be optimized for this. */ parentChannel = Tls_GetParent(statePtr, 0); parentChannelType = Tcl_GetChannelType(parentChannel); validParentChannelFd = 0; if (strcmp(parentChannelType->typeName, "tcp") == 0) { |
︙ |