ObjOpenSSL  Check-in [64d3ec13b0]

Overview
Comment:Update to recent ObjFW changes.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 64d3ec13b0a3b4aeb9868cf6a1b452225ba0e36d4c902239fdb8f4628ce02ae0
User & Date: js on 2013-02-21 23:41:11
Other Links: manifest | tags
Context
2013-03-04
17:37
Replace BOOL with bool. check-in: 09e348c39a user: js tags: trunk
2013-02-21
23:41
Update to recent ObjFW changes. check-in: 64d3ec13b0 user: js tags: trunk
2013-02-14
02:20
Add -Wdocumentation if supported by the compiler. check-in: 16a02009a3 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified ObjOpenSSL.xcodeproj/project.pbxproj from [7cd4c7e79b] to [acfffb2c94].

︙︙
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141

		};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
		4B1918E01341272300D82152 /* Project object */ = {
			isa = PBXProject;
			attributes = {
				LastUpgradeCheck = 0420;
			};
			buildConfigurationList = 4B1918E31341272300D82152 /* Build configuration list for PBXProject "ObjOpenSSL" */;
			compatibilityVersion = "Xcode 3.2";
			developmentRegion = English;
			hasScannedForEncodings = 0;
			knownRegions = (
				en,








|








127
128
129
130
131
132
133
134
135
136
137
138
139
140
141

		};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
		4B1918E01341272300D82152 /* Project object */ = {
			isa = PBXProject;
			attributes = {
				LastUpgradeCheck = 0460;
			};
			buildConfigurationList = 4B1918E31341272300D82152 /* Build configuration list for PBXProject "ObjOpenSSL" */;
			compatibilityVersion = "Xcode 3.2";
			developmentRegion = English;
			hasScannedForEncodings = 0;
			knownRegions = (
				en,
︙︙

Modified src/SSLSocket.m from [5ed521dab9] to [b2157a98b6].

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


	if (SSL_write(_SSL, buffer, (int)length) < length)
		@throw [OFWriteFailedException exceptionWithClass: [self class]
							   stream: self
						  requestedLength: length];
}

- (size_t)pendingBytes
{
	if (_SSL == NULL)
		return [super pendingBytes];

	return [super pendingBytes] + SSL_pending(_SSL);
}

- (void)setPrivateKeyFile: (OFString*)privateKeyFile
{
	OF_SETTER(_privateKeyFile, privateKeyFile, YES, YES)
}









|


|

|








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


	if (SSL_write(_SSL, buffer, (int)length) < length)
		@throw [OFWriteFailedException exceptionWithClass: [self class]
							   stream: self
						  requestedLength: length];
}

- (size_t)numberOfBytesInReadBuffer
{
	if (_SSL == NULL)
		return [super numberOfBytesInReadBuffer];

	return [super numberOfBytesInReadBuffer] + SSL_pending(_SSL);
}

- (void)setPrivateKeyFile: (OFString*)privateKeyFile
{
	OF_SETTER(_privateKeyFile, privateKeyFile, YES, YES)
}
︙︙