ObjOpenSSL  Diff

Annotate Patch Unified Diff

Differences From Artifact [34fa5beeb0]:

To Artifact [3a18c90434]:

1
2
3
4
5
6
7
8
9




10
11
12
13
14
15
16
17




18
19
20
21
22
23
24

// !$*UTF8*$!
{
	archiveVersion = 1;
	classes = {
	};
	objectVersion = 46;
	objects = {

/* Begin PBXBuildFile section */




		4B4F087813A01EEF00B60C3F /* ObjOpenSSL.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B4F087713A01EEF00B60C3F /* ObjOpenSSL.h */; settings = {ATTRIBUTES = (Public, ); }; };
		4BD0AAEC1341289500445289 /* SSLSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD0AAEA1341289500445289 /* SSLSocket.h */; settings = {ATTRIBUTES = (Public, ); }; };
		4BD0AAED1341289500445289 /* SSLSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD0AAEB1341289500445289 /* SSLSocket.m */; };
		4BD0AAEF134128B200445289 /* ObjFW.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BD0AAEE134128B200445289 /* ObjFW.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
		4B1918EA1341272300D82152 /* ObjOpenSSL.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjOpenSSL.framework; sourceTree = BUILT_PRODUCTS_DIR; };




		4B4F087713A01EEF00B60C3F /* ObjOpenSSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ObjOpenSSL.h; path = src/ObjOpenSSL.h; sourceTree = SOURCE_ROOT; };
		4BD0AAE91341286B00445289 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; };
		4BD0AAEA1341289500445289 /* SSLSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SSLSocket.h; path = src/SSLSocket.h; sourceTree = SOURCE_ROOT; };
		4BD0AAEB1341289500445289 /* SSLSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SSLSocket.m; path = src/SSLSocket.m; sourceTree = SOURCE_ROOT; };
		4BD0AAEE134128B200445289 /* ObjFW.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ObjFW.framework; path = Library/Frameworks/ObjFW.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */











>
>
>
>








>
>
>
>








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

// !$*UTF8*$!
{
	archiveVersion = 1;
	classes = {
	};
	objectVersion = 46;
	objects = {

/* Begin PBXBuildFile section */
		4B19F58B14D17250005D52DC /* SSLInvalidCertificateException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19F58714D17250005D52DC /* SSLInvalidCertificateException.h */; };
		4B19F58C14D17250005D52DC /* SSLInvalidCertificateException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B19F58814D17250005D52DC /* SSLInvalidCertificateException.m */; };
		4B19F58D14D17250005D52DC /* X509Certificate.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19F58914D17250005D52DC /* X509Certificate.h */; };
		4B19F58E14D17250005D52DC /* X509Certificate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B19F58A14D17250005D52DC /* X509Certificate.m */; };
		4B4F087813A01EEF00B60C3F /* ObjOpenSSL.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B4F087713A01EEF00B60C3F /* ObjOpenSSL.h */; settings = {ATTRIBUTES = (Public, ); }; };
		4BD0AAEC1341289500445289 /* SSLSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD0AAEA1341289500445289 /* SSLSocket.h */; settings = {ATTRIBUTES = (Public, ); }; };
		4BD0AAED1341289500445289 /* SSLSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD0AAEB1341289500445289 /* SSLSocket.m */; };
		4BD0AAEF134128B200445289 /* ObjFW.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BD0AAEE134128B200445289 /* ObjFW.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
		4B1918EA1341272300D82152 /* ObjOpenSSL.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjOpenSSL.framework; sourceTree = BUILT_PRODUCTS_DIR; };
		4B19F58714D17250005D52DC /* SSLInvalidCertificateException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SSLInvalidCertificateException.h; path = src/SSLInvalidCertificateException.h; sourceTree = SOURCE_ROOT; };
		4B19F58814D17250005D52DC /* SSLInvalidCertificateException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SSLInvalidCertificateException.m; path = src/SSLInvalidCertificateException.m; sourceTree = SOURCE_ROOT; };
		4B19F58914D17250005D52DC /* X509Certificate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = X509Certificate.h; path = src/X509Certificate.h; sourceTree = SOURCE_ROOT; };
		4B19F58A14D17250005D52DC /* X509Certificate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = X509Certificate.m; path = src/X509Certificate.m; sourceTree = SOURCE_ROOT; };
		4B4F087713A01EEF00B60C3F /* ObjOpenSSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ObjOpenSSL.h; path = src/ObjOpenSSL.h; sourceTree = SOURCE_ROOT; };
		4BD0AAE91341286B00445289 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; };
		4BD0AAEA1341289500445289 /* SSLSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SSLSocket.h; path = src/SSLSocket.h; sourceTree = SOURCE_ROOT; };
		4BD0AAEB1341289500445289 /* SSLSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SSLSocket.m; path = src/SSLSocket.m; sourceTree = SOURCE_ROOT; };
		4BD0AAEE134128B200445289 /* ObjFW.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ObjFW.framework; path = Library/Frameworks/ObjFW.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */
︙︙
60
61
62
63
64
65
66


67
68


69
70
71
72
73
74
75

			sourceTree = "<group>";
		};
		4B1918F31341272300D82152 /* ObjOpenSSL */ = {
			isa = PBXGroup;
			children = (
				4B1918F41341272300D82152 /* Supporting Files */,
				4B4F087713A01EEF00B60C3F /* ObjOpenSSL.h */,


				4BD0AAEA1341289500445289 /* SSLSocket.h */,
				4BD0AAEB1341289500445289 /* SSLSocket.m */,


			);
			path = ObjOpenSSL;
			sourceTree = "<group>";
		};
		4B1918F41341272300D82152 /* Supporting Files */ = {
			isa = PBXGroup;
			children = (








>
>


>
>








68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87

			sourceTree = "<group>";
		};
		4B1918F31341272300D82152 /* ObjOpenSSL */ = {
			isa = PBXGroup;
			children = (
				4B1918F41341272300D82152 /* Supporting Files */,
				4B4F087713A01EEF00B60C3F /* ObjOpenSSL.h */,
				4B19F58714D17250005D52DC /* SSLInvalidCertificateException.h */,
				4B19F58814D17250005D52DC /* SSLInvalidCertificateException.m */,
				4BD0AAEA1341289500445289 /* SSLSocket.h */,
				4BD0AAEB1341289500445289 /* SSLSocket.m */,
				4B19F58914D17250005D52DC /* X509Certificate.h */,
				4B19F58A14D17250005D52DC /* X509Certificate.m */,
			);
			path = ObjOpenSSL;
			sourceTree = "<group>";
		};
		4B1918F41341272300D82152 /* Supporting Files */ = {
			isa = PBXGroup;
			children = (
︙︙
83
84
85
86
87
88
89


90
91
92
93
94
95
96

/* Begin PBXHeadersBuildPhase section */
		4B1918E71341272300D82152 /* Headers */ = {
			isa = PBXHeadersBuildPhase;
			buildActionMask = 2147483647;
			files = (
				4B4F087813A01EEF00B60C3F /* ObjOpenSSL.h in Headers */,
				4BD0AAEC1341289500445289 /* SSLSocket.h in Headers */,


			);
			runOnlyForDeploymentPostprocessing = 0;
		};
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
		4B1918E91341272300D82152 /* ObjOpenSSL */ = {








>
>








95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110

/* Begin PBXHeadersBuildPhase section */
		4B1918E71341272300D82152 /* Headers */ = {
			isa = PBXHeadersBuildPhase;
			buildActionMask = 2147483647;
			files = (
				4B4F087813A01EEF00B60C3F /* ObjOpenSSL.h in Headers */,
				4BD0AAEC1341289500445289 /* SSLSocket.h in Headers */,
				4B19F58B14D17250005D52DC /* SSLInvalidCertificateException.h in Headers */,
				4B19F58D14D17250005D52DC /* X509Certificate.h in Headers */,
			);
			runOnlyForDeploymentPostprocessing = 0;
		};
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
		4B1918E91341272300D82152 /* ObjOpenSSL */ = {
︙︙
145
146
147
148
149
150
151


152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
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
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
244
245
246
247
248
249
250
251
252
253
254
255
256
257


/* Begin PBXSourcesBuildPhase section */
		4B1918E51341272300D82152 /* Sources */ = {
			isa = PBXSourcesBuildPhase;
			buildActionMask = 2147483647;
			files = (
				4BD0AAED1341289500445289 /* SSLSocket.m in Sources */,


			);
			runOnlyForDeploymentPostprocessing = 0;
		};
/* End PBXSourcesBuildPhase section */

/* Begin XCBuildConfiguration section */
		4B1918FA1341272300D82152 /* Debug */ = {
			isa = XCBuildConfiguration;
			buildSettings = {
				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
				GCC_C_LANGUAGE_STANDARD = gnu99;
				GCC_OPTIMIZATION_LEVEL = 0;
				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
				GCC_WARN_ABOUT_RETURN_TYPE = YES;
				GCC_WARN_UNUSED_VARIABLE = YES;
				MACOSX_DEPLOYMENT_TARGET = 10.6;
				ONLY_ACTIVE_ARCH = YES;
				SDKROOT = macosx;
			};
			name = Debug;
		};
		4B1918FB1341272300D82152 /* Release */ = {
			isa = XCBuildConfiguration;
			buildSettings = {
				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
				GCC_C_LANGUAGE_STANDARD = gnu99;
				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
				GCC_WARN_ABOUT_RETURN_TYPE = YES;
				GCC_WARN_UNUSED_VARIABLE = YES;
				MACOSX_DEPLOYMENT_TARGET = 10.6;
				SDKROOT = macosx;
			};
			name = Release;
		};
		4B1918FD1341272300D82152 /* Debug */ = {
			isa = XCBuildConfiguration;
			buildSettings = {
				ALWAYS_SEARCH_USER_PATHS = NO;
				COPY_PHASE_STRIP = NO;
				DYLIB_COMPATIBILITY_VERSION = 1;
				DYLIB_CURRENT_VERSION = 1;
				FRAMEWORK_VERSION = A;
				GCC_DYNAMIC_NO_PIC = NO;
				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
				GCC_VERSION = 4.2;
				INFOPLIST_FILE = Info.plist;
				OTHER_CFLAGS = (
					"-I/opt/local/include",
					"-fconstant-string-class=OFConstantString",
					"-fno-constant-cfstrings",
				);
				OTHER_LDFLAGS = (
					"-lssl",
					"-lcrypto",
					"-lz",
				);
				PRODUCT_NAME = "$(TARGET_NAME)";
				WARNING_CFLAGS = (
					"-Wall",
					"-Werror",
					"-Wshorten-64-to-32",
					"-Wwrite-strings",
					"-Wcast-align",
					"-Wpointer-arith",
				);
				WRAPPER_EXTENSION = framework;
			};
			name = Debug;
		};
		4B1918FE1341272300D82152 /* Release */ = {
			isa = XCBuildConfiguration;
			buildSettings = {
				ALWAYS_SEARCH_USER_PATHS = NO;
				COPY_PHASE_STRIP = YES;
				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
				DYLIB_COMPATIBILITY_VERSION = 1;
				DYLIB_CURRENT_VERSION = 1;
				FRAMEWORK_VERSION = A;
				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
				GCC_VERSION = 4.2;
				INFOPLIST_FILE = Info.plist;
				OTHER_CFLAGS = (
					"-I/opt/local/include",
					"-fconstant-string-class=OFConstantString",
					"-fno-constant-cfstrings",
				);
				OTHER_LDFLAGS = (
					"-lssl",
					"-lcrypto",
					"-lz",
				);
				PRODUCT_NAME = "$(TARGET_NAME)";
				WARNING_CFLAGS = (
					"-Wall",
					"-Werror",
					"-Wshorten-64-to-32",
					"-Wwrite-strings",
					"-Wcast-align",
					"-Wpointer-arith",
				);
				WRAPPER_EXTENSION = framework;
			};








>
>














<














<


















|














<



















|














<








159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
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
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
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262

263
264
265
266
267
268
269


/* Begin PBXSourcesBuildPhase section */
		4B1918E51341272300D82152 /* Sources */ = {
			isa = PBXSourcesBuildPhase;
			buildActionMask = 2147483647;
			files = (
				4BD0AAED1341289500445289 /* SSLSocket.m in Sources */,
				4B19F58C14D17250005D52DC /* SSLInvalidCertificateException.m in Sources */,
				4B19F58E14D17250005D52DC /* X509Certificate.m in Sources */,
			);
			runOnlyForDeploymentPostprocessing = 0;
		};
/* End PBXSourcesBuildPhase section */

/* Begin XCBuildConfiguration section */
		4B1918FA1341272300D82152 /* Debug */ = {
			isa = XCBuildConfiguration;
			buildSettings = {
				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
				GCC_C_LANGUAGE_STANDARD = gnu99;
				GCC_OPTIMIZATION_LEVEL = 0;
				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
				GCC_SYMBOLS_PRIVATE_EXTERN = NO;

				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
				GCC_WARN_ABOUT_RETURN_TYPE = YES;
				GCC_WARN_UNUSED_VARIABLE = YES;
				MACOSX_DEPLOYMENT_TARGET = 10.6;
				ONLY_ACTIVE_ARCH = YES;
				SDKROOT = macosx;
			};
			name = Debug;
		};
		4B1918FB1341272300D82152 /* Release */ = {
			isa = XCBuildConfiguration;
			buildSettings = {
				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
				GCC_C_LANGUAGE_STANDARD = gnu99;

				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
				GCC_WARN_ABOUT_RETURN_TYPE = YES;
				GCC_WARN_UNUSED_VARIABLE = YES;
				MACOSX_DEPLOYMENT_TARGET = 10.6;
				SDKROOT = macosx;
			};
			name = Release;
		};
		4B1918FD1341272300D82152 /* Debug */ = {
			isa = XCBuildConfiguration;
			buildSettings = {
				ALWAYS_SEARCH_USER_PATHS = NO;
				COPY_PHASE_STRIP = NO;
				DYLIB_COMPATIBILITY_VERSION = 1;
				DYLIB_CURRENT_VERSION = 1;
				FRAMEWORK_VERSION = A;
				GCC_DYNAMIC_NO_PIC = NO;
				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
				GCC_VERSION = com.apple.compilers.llvmgcc42;
				INFOPLIST_FILE = Info.plist;
				OTHER_CFLAGS = (
					"-I/opt/local/include",
					"-fconstant-string-class=OFConstantString",
					"-fno-constant-cfstrings",
				);
				OTHER_LDFLAGS = (
					"-lssl",
					"-lcrypto",
					"-lz",
				);
				PRODUCT_NAME = "$(TARGET_NAME)";
				WARNING_CFLAGS = (
					"-Wall",

					"-Wshorten-64-to-32",
					"-Wwrite-strings",
					"-Wcast-align",
					"-Wpointer-arith",
				);
				WRAPPER_EXTENSION = framework;
			};
			name = Debug;
		};
		4B1918FE1341272300D82152 /* Release */ = {
			isa = XCBuildConfiguration;
			buildSettings = {
				ALWAYS_SEARCH_USER_PATHS = NO;
				COPY_PHASE_STRIP = YES;
				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
				DYLIB_COMPATIBILITY_VERSION = 1;
				DYLIB_CURRENT_VERSION = 1;
				FRAMEWORK_VERSION = A;
				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
				GCC_VERSION = com.apple.compilers.llvmgcc42;
				INFOPLIST_FILE = Info.plist;
				OTHER_CFLAGS = (
					"-I/opt/local/include",
					"-fconstant-string-class=OFConstantString",
					"-fno-constant-cfstrings",
				);
				OTHER_LDFLAGS = (
					"-lssl",
					"-lcrypto",
					"-lz",
				);
				PRODUCT_NAME = "$(TARGET_NAME)";
				WARNING_CFLAGS = (
					"-Wall",

					"-Wshorten-64-to-32",
					"-Wwrite-strings",
					"-Wcast-align",
					"-Wpointer-arith",
				);
				WRAPPER_EXTENSION = framework;
			};
︙︙