ObjOpenSSL  Diff

Differences From Artifact [7c2c09a5dc]:

To Artifact [3dadaa27ad]:


280
281
282
283
284
285
286
287
288
289
290
291
292
293
294

295
296
297
298
299
300
301
280
281
282
283
284
285
286






287

288
289
290
291
292
293
294
295







-
-
-
-
-
-

-
+







	[super close];
}

- (size_t)lowlevelReadIntoBuffer: (void *)buffer length: (size_t)length
{
	ssize_t ret;

	/*
	 * There is no SSL session yet. However, it might be necessary to read
	 * from and write to the socket before negotiating an SSL session: For
	 * example, the socket might be connected to a SOCKS5 proxy and needs
	 * to establish a SOCKS5 connection before negotiating an SSL session.
	 */
	if (_SSL == NULL)
		return [self lowlevelTCPReadIntoBuffer: buffer length: length];
		@throw [OFNotOpenException exceptionWithObject: self];

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

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

319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337

338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354

355
356
357

358
359

360
361
362
363
364
365
366
313
314
315
316
317
318
319










320

321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337

338
339
340

341
342

343
344
345
346
347
348
349
350







-
-
-
-
-
-
-
-
-
-

-
+
















-
+


-
+

-
+







	return ret;
}

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

	/*
	 * There is no SSL session yet. However, it might be necessary to read
	 * from and write to the socket before negotiating an SSL session: For
	 * example, the socket might be connected to a SOCKS5 proxy and needs
	 * to establish a SOCKS5 connection before negotiating an SSL session.
	 *
	 * TODO: Think of a way to make this safer, so that it's impossible to
	 * forget to establish an SSL session and then send unencrypted data by
	 * accident.
	 */
	if (_SSL == NULL)
		return [self lowlevelTCPWriteBuffer: buffer length: length];
		@throw [OFNotOpenException exceptionWithObject: self];

	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];

	return bytesWritten;
}

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

	return [self lowlevelTCPIsAtEndOfStream];
	return [super hasDataInReadBuffer];
}

- (OFData *)channelBindingDataWithType: (OFString *)type
{
	size_t length;
	char buffer[64];