Overview
| Comment: | Adjust to recent ObjFW changes. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
58b7b70ed28f63e3dc3e19bd86ce9ede |
| User & Date: | js on 2011-09-19 16:37:49 |
| Other Links: | manifest | tags |
Context
|
2011-09-22
| ||
| 13:52 | Fix type conflict. check-in: 7714264163 user: js tags: trunk | |
|
2011-09-19
| ||
| 16:37 | Adjust to recent ObjFW changes. check-in: 58b7b70ed2 user: js tags: trunk | |
|
2011-09-12
| ||
| 20:05 | Update to recent ObjFW changes. check-in: 10e7f26817 user: js tags: trunk | |
Changes
Modified src/SSLSocket.m from [dcf1fbd21d] to [3ce831d2bc].
| ︙ | ︙ | |||
193 194 195 196 197 198 199 | if (length > INT_MAX) @throw [OFOutOfRangeException newWithClass: isa]; if (sock == INVALID_SOCKET) @throw [OFNotConnectedException newWithClass: isa socket: self]; | | | | | 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 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 |
if (length > INT_MAX)
@throw [OFOutOfRangeException newWithClass: isa];
if (sock == INVALID_SOCKET)
@throw [OFNotConnectedException newWithClass: isa
socket: self];
if (atEndOfStream) {
OFReadFailedException *e;
e = [OFReadFailedException newWithClass: isa
stream: self
requestedLength: length];
#ifndef _WIN32
e->errNo = ENOTCONN;
#else
e->errNo = WSAENOTCONN;
#endif
@throw e;
}
if ((ret = SSL_read(ssl, buffer, (int)length)) < 0)
@throw [OFReadFailedException newWithClass: isa
stream: self
requestedLength: length];
if (ret == 0)
atEndOfStream = YES;
return ret;
}
- (void)_writeNBytes: (size_t)length
fromBuffer: (const char*)buffer
{
if (length > INT_MAX)
@throw [OFOutOfRangeException newWithClass: isa];
if (sock == INVALID_SOCKET)
@throw [OFNotConnectedException newWithClass: isa
socket: self];
if (atEndOfStream) {
OFWriteFailedException *e;
e = [OFWriteFailedException newWithClass: isa
stream: self
requestedLength: length];
#ifndef _WIN32
|
| ︙ | ︙ | |||
286 287 288 289 290 291 292 | char buffer[64]; OFDataArray *data; if (![type isEqual: @"tls-unique"]) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; | | | 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 |
char buffer[64];
OFDataArray *data;
if (![type isEqual: @"tls-unique"])
@throw [OFInvalidArgumentException newWithClass: isa
selector: _cmd];
if (SSL_session_reused(ssl) ^ !listening) {
/*
* We are either client or the session has been resumed
* => we have sent the finished message
*/
length = SSL_get_finished(ssl, buffer, 64);
} else {
/* peer sent the finished message */
|
| ︙ | ︙ |