ObjOpenSSL  Check-in [9c2e824983]

Overview
Comment:Adjust to ObjFW changes
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 9c2e824983dd02d92e625ebae5c75959ee99ba1eda7414c712c43809773469ea
User & Date: js on 2017-07-02 12:22:03
Other Links: manifest | tags
Context
2017-07-22
23:09
Adjust to ObjFW changes check-in: 586a59246a user: js tags: trunk
2017-07-02
12:22
Adjust to ObjFW changes check-in: 9c2e824983 user: js tags: trunk
2017-06-21
21:04
Adjust to ObjFW changes check-in: 2ee844508a user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/SSLSocket.m from [5841f82ac0] to [3aefdbc324].

︙︙
351
352
353
354
355
356
357
358
359
360
361
362
363


364

365
366

367
368
369
370
371

372
373
374
375
376
377
378


	return ret;
}

- (void)lowlevelWriteBuffer: (const void *)buffer
		     length: (size_t)length
{
	if (length > INT_MAX)
		@throw [OFOutOfRangeException exception];

	if (_socket == INVALID_SOCKET)
		@throw [OFNotOpenException exceptionWithObject: self];



	if (_atEndOfStream)

		@throw [OFWriteFailedException exceptionWithObject: self
						   requestedLength: length

							     errNo: ENOTCONN];

	if (SSL_write(_SSL, buffer, (int)length) < length)
		@throw [OFWriteFailedException exceptionWithObject: self
						   requestedLength: length

							     errNo: 0];
}

- (bool)hasDataInReadBuffer
{
	if (_SSL != NULL && SSL_pending(_SSL) > 0)
		return true;








|
<




>
>
|
>


>
|

|


>








351
352
353
354
355
356
357
358

359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382


	return ret;
}

- (void)lowlevelWriteBuffer: (const void *)buffer
		     length: (size_t)length
{
	int bytesWritten;


	if (_socket == INVALID_SOCKET)
		@throw [OFNotOpenException exceptionWithObject: self];

	if (length > INT_MAX)
		@throw [OFOutOfRangeException exception];

	if ((bytesWritten = SSL_write(_SSL, buffer, (int)length)) < 0)
		@throw [OFWriteFailedException exceptionWithObject: self
						   requestedLength: length
						      bytesWritten: 0
							     errNo: 0];

	if ((size_t)bytesWritten != length)
		@throw [OFWriteFailedException exceptionWithObject: self
						   requestedLength: length
						      bytesWritten: bytesWritten
							     errNo: 0];
}

- (bool)hasDataInReadBuffer
{
	if (_SSL != NULL && SSL_pending(_SSL) > 0)
		return true;
︙︙