summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent dot torri at gmail dot com>2015-10-29 10:40:26 +0100
committerNicolas Aguirre <aguirre.nicolas@gmail.com>2015-11-10 08:27:25 +0100
commit3595089edba808f9c1eb077ff1bdba94991cfc15 (patch)
tree37d7a28cfeefaf4695c57da4c3da0863e15f2df4
parent4cc70701aecef38d234d63d88f6f4bad64c6e68d (diff)
Ecore_Con: fix warning on Windows
the macro ERROR is already defined on Windows. Rename it to ERROR_SSL
-rw-r--r--src/lib/ecore_con/ecore_con_ssl.c110
1 files changed, 55 insertions, 55 deletions
diff --git a/src/lib/ecore_con/ecore_con_ssl.c b/src/lib/ecore_con/ecore_con_ssl.c
index d66262da84..f16dd69d76 100644
--- a/src/lib/ecore_con/ecore_con_ssl.c
+++ b/src/lib/ecore_con/ecore_con_ssl.c
@@ -152,178 +152,178 @@ _openssl_print_verify_error(int error)
152{ 152{
153 switch (error) 153 switch (error)
154 { 154 {
155#define ERROR(X) \ 155#define ERROR_SSL(X) \
156case (X): \ 156case (X): \
157 ERR("%s", #X); \ 157 ERR("%s", #X); \
158 break 158 break
159#ifdef X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT 159#ifdef X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT
160 ERROR(X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT); 160 ERROR_SSL(X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT);
161#endif 161#endif
162#ifdef X509_V_ERR_UNABLE_TO_GET_CRL 162#ifdef X509_V_ERR_UNABLE_TO_GET_CRL
163 ERROR(X509_V_ERR_UNABLE_TO_GET_CRL); 163 ERROR_SSL(X509_V_ERR_UNABLE_TO_GET_CRL);
164#endif 164#endif
165#ifdef X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE 165#ifdef X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE
166 ERROR(X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE); 166 ERROR_SSL(X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE);
167#endif 167#endif
168#ifdef X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE 168#ifdef X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE
169 ERROR(X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE); 169 ERROR_SSL(X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE);
170#endif 170#endif
171#ifdef X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY 171#ifdef X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY
172 ERROR(X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY); 172 ERROR_SSL(X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY);
173#endif 173#endif
174#ifdef X509_V_ERR_CERT_SIGNATURE_FAILURE 174#ifdef X509_V_ERR_CERT_SIGNATURE_FAILURE
175 ERROR(X509_V_ERR_CERT_SIGNATURE_FAILURE); 175 ERROR_SSL(X509_V_ERR_CERT_SIGNATURE_FAILURE);
176#endif 176#endif
177#ifdef X509_V_ERR_CRL_SIGNATURE_FAILURE 177#ifdef X509_V_ERR_CRL_SIGNATURE_FAILURE
178 ERROR(X509_V_ERR_CRL_SIGNATURE_FAILURE); 178 ERROR_SSL(X509_V_ERR_CRL_SIGNATURE_FAILURE);
179#endif 179#endif
180#ifdef X509_V_ERR_CERT_NOT_YET_VALID 180#ifdef X509_V_ERR_CERT_NOT_YET_VALID
181 ERROR(X509_V_ERR_CERT_NOT_YET_VALID); 181 ERROR_SSL(X509_V_ERR_CERT_NOT_YET_VALID);
182#endif 182#endif
183#ifdef X509_V_ERR_CERT_HAS_EXPIRED 183#ifdef X509_V_ERR_CERT_HAS_EXPIRED
184 ERROR(X509_V_ERR_CERT_HAS_EXPIRED); 184 ERROR_SSL(X509_V_ERR_CERT_HAS_EXPIRED);
185#endif 185#endif
186#ifdef X509_V_ERR_CRL_NOT_YET_VALID 186#ifdef X509_V_ERR_CRL_NOT_YET_VALID
187 ERROR(X509_V_ERR_CRL_NOT_YET_VALID); 187 ERROR_SSL(X509_V_ERR_CRL_NOT_YET_VALID);
188#endif 188#endif
189#ifdef X509_V_ERR_CRL_HAS_EXPIRED 189#ifdef X509_V_ERR_CRL_HAS_EXPIRED
190 ERROR(X509_V_ERR_CRL_HAS_EXPIRED); 190 ERROR_SSL(X509_V_ERR_CRL_HAS_EXPIRED);
191#endif 191#endif
192#ifdef X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD 192#ifdef X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD
193 ERROR(X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD); 193 ERROR_SSL(X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD);
194#endif 194#endif
195#ifdef X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD 195#ifdef X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD
196 ERROR(X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD); 196 ERROR_SSL(X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD);
197#endif 197#endif
198#ifdef X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD 198#ifdef X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD
199 ERROR(X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD); 199 ERROR_SSL(X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD);
200#endif 200#endif
201#ifdef X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD 201#ifdef X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD
202 ERROR(X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD); 202 ERROR_SSL(X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD);
203#endif 203#endif
204#ifdef X509_V_ERR_OUT_OF_MEM 204#ifdef X509_V_ERR_OUT_OF_MEM
205 ERROR(X509_V_ERR_OUT_OF_MEM); 205 ERROR_SSL(X509_V_ERR_OUT_OF_MEM);
206#endif 206#endif
207#ifdef X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT 207#ifdef X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT
208 ERROR(X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT); 208 ERROR_SSL(X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT);
209#endif 209#endif
210#ifdef X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN 210#ifdef X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN
211 ERROR(X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN); 211 ERROR_SSL(X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN);
212#endif 212#endif
213#ifdef X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY 213#ifdef X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY
214 ERROR(X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY); 214 ERROR_SSL(X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY);
215#endif 215#endif
216#ifdef X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE 216#ifdef X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE
217 ERROR(X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE); 217 ERROR_SSL(X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE);
218#endif 218#endif
219#ifdef X509_V_ERR_CERT_CHAIN_TOO_LONG 219#ifdef X509_V_ERR_CERT_CHAIN_TOO_LONG
220 ERROR(X509_V_ERR_CERT_CHAIN_TOO_LONG); 220 ERROR_SSL(X509_V_ERR_CERT_CHAIN_TOO_LONG);
221#endif 221#endif
222#ifdef X509_V_ERR_CERT_REVOKED 222#ifdef X509_V_ERR_CERT_REVOKED
223 ERROR(X509_V_ERR_CERT_REVOKED); 223 ERROR_SSL(X509_V_ERR_CERT_REVOKED);
224#endif 224#endif
225#ifdef X509_V_ERR_INVALID_CA 225#ifdef X509_V_ERR_INVALID_CA
226 ERROR(X509_V_ERR_INVALID_CA); 226 ERROR_SSL(X509_V_ERR_INVALID_CA);
227#endif 227#endif
228#ifdef X509_V_ERR_PATH_LENGTH_EXCEEDED 228#ifdef X509_V_ERR_PATH_LENGTH_EXCEEDED
229 ERROR(X509_V_ERR_PATH_LENGTH_EXCEEDED); 229 ERROR_SSL(X509_V_ERR_PATH_LENGTH_EXCEEDED);
230#endif 230#endif
231#ifdef X509_V_ERR_INVALID_PURPOSE 231#ifdef X509_V_ERR_INVALID_PURPOSE
232 ERROR(X509_V_ERR_INVALID_PURPOSE); 232 ERROR_SSL(X509_V_ERR_INVALID_PURPOSE);
233#endif 233#endif
234#ifdef X509_V_ERR_CERT_UNTRUSTED 234#ifdef X509_V_ERR_CERT_UNTRUSTED
235 ERROR(X509_V_ERR_CERT_UNTRUSTED); 235 ERROR_SSL(X509_V_ERR_CERT_UNTRUSTED);
236#endif 236#endif
237#ifdef X509_V_ERR_CERT_REJECTED 237#ifdef X509_V_ERR_CERT_REJECTED
238 ERROR(X509_V_ERR_CERT_REJECTED); 238 ERROR_SSL(X509_V_ERR_CERT_REJECTED);
239#endif 239#endif
240 /* These are 'informational' when looking for issuer cert */ 240 /* These are 'informational' when looking for issuer cert */
241#ifdef X509_V_ERR_SUBJECT_ISSUER_MISMATCH 241#ifdef X509_V_ERR_SUBJECT_ISSUER_MISMATCH
242 ERROR(X509_V_ERR_SUBJECT_ISSUER_MISMATCH); 242 ERROR_SSL(X509_V_ERR_SUBJECT_ISSUER_MISMATCH);
243#endif 243#endif
244#ifdef X509_V_ERR_AKID_SKID_MISMATCH 244#ifdef X509_V_ERR_AKID_SKID_MISMATCH
245 ERROR(X509_V_ERR_AKID_SKID_MISMATCH); 245 ERROR_SSL(X509_V_ERR_AKID_SKID_MISMATCH);
246#endif 246#endif
247#ifdef X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH 247#ifdef X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH
248 ERROR(X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH); 248 ERROR_SSL(X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH);
249#endif 249#endif
250#ifdef X509_V_ERR_KEYUSAGE_NO_CERTSIGN 250#ifdef X509_V_ERR_KEYUSAGE_NO_CERTSIGN
251 ERROR(X509_V_ERR_KEYUSAGE_NO_CERTSIGN); 251 ERROR_SSL(X509_V_ERR_KEYUSAGE_NO_CERTSIGN);
252#endif 252#endif
253 253
254#ifdef X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER 254#ifdef X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER
255 ERROR(X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER); 255 ERROR_SSL(X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER);
256#endif 256#endif
257#ifdef X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION 257#ifdef X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION
258 ERROR(X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION); 258 ERROR_SSL(X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION);
259#endif 259#endif
260#ifdef X509_V_ERR_KEYUSAGE_NO_CRL_SIGN 260#ifdef X509_V_ERR_KEYUSAGE_NO_CRL_SIGN
261 ERROR(X509_V_ERR_KEYUSAGE_NO_CRL_SIGN); 261 ERROR_SSL(X509_V_ERR_KEYUSAGE_NO_CRL_SIGN);
262#endif 262#endif
263#ifdef X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION 263#ifdef X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION
264 ERROR(X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION); 264 ERROR_SSL(X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION);
265#endif 265#endif
266#ifdef X509_V_ERR_INVALID_NON_CA 266#ifdef X509_V_ERR_INVALID_NON_CA
267 ERROR(X509_V_ERR_INVALID_NON_CA); 267 ERROR_SSL(X509_V_ERR_INVALID_NON_CA);
268#endif 268#endif
269#ifdef X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED 269#ifdef X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED
270 ERROR(X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED); 270 ERROR_SSL(X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED);
271#endif 271#endif
272#ifdef X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE 272#ifdef X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE
273 ERROR(X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE); 273 ERROR_SSL(X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE);
274#endif 274#endif
275#ifdef X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED 275#ifdef X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED
276 ERROR(X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED); 276 ERROR_SSL(X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED);
277#endif 277#endif
278 278
279#ifdef X509_V_ERR_INVALID_EXTENSION 279#ifdef X509_V_ERR_INVALID_EXTENSION
280 ERROR(X509_V_ERR_INVALID_EXTENSION); 280 ERROR_SSL(X509_V_ERR_INVALID_EXTENSION);
281#endif 281#endif
282#ifdef X509_V_ERR_INVALID_POLICY_EXTENSION 282#ifdef X509_V_ERR_INVALID_POLICY_EXTENSION
283 ERROR(X509_V_ERR_INVALID_POLICY_EXTENSION); 283 ERROR_SSL(X509_V_ERR_INVALID_POLICY_EXTENSION);
284#endif 284#endif
285#ifdef X509_V_ERR_NO_EXPLICIT_POLICY 285#ifdef X509_V_ERR_NO_EXPLICIT_POLICY
286 ERROR(X509_V_ERR_NO_EXPLICIT_POLICY); 286 ERROR_SSL(X509_V_ERR_NO_EXPLICIT_POLICY);
287#endif 287#endif
288#ifdef X509_V_ERR_DIFFERENT_CRL_SCOPE 288#ifdef X509_V_ERR_DIFFERENT_CRL_SCOPE
289 ERROR(X509_V_ERR_DIFFERENT_CRL_SCOPE); 289 ERROR_SSL(X509_V_ERR_DIFFERENT_CRL_SCOPE);
290#endif 290#endif
291#ifdef X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE 291#ifdef X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE
292 ERROR(X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE); 292 ERROR_SSL(X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE);
293#endif 293#endif
294 294
295#ifdef X509_V_ERR_UNNESTED_RESOURCE 295#ifdef X509_V_ERR_UNNESTED_RESOURCE
296 ERROR(X509_V_ERR_UNNESTED_RESOURCE); 296 ERROR_SSL(X509_V_ERR_UNNESTED_RESOURCE);
297#endif 297#endif
298 298
299#ifdef X509_V_ERR_PERMITTED_VIOLATION 299#ifdef X509_V_ERR_PERMITTED_VIOLATION
300 ERROR(X509_V_ERR_PERMITTED_VIOLATION); 300 ERROR_SSL(X509_V_ERR_PERMITTED_VIOLATION);
301#endif 301#endif
302#ifdef X509_V_ERR_EXCLUDED_VIOLATION 302#ifdef X509_V_ERR_EXCLUDED_VIOLATION
303 ERROR(X509_V_ERR_EXCLUDED_VIOLATION); 303 ERROR_SSL(X509_V_ERR_EXCLUDED_VIOLATION);
304#endif 304#endif
305#ifdef X509_V_ERR_SUBTREE_MINMAX 305#ifdef X509_V_ERR_SUBTREE_MINMAX
306 ERROR(X509_V_ERR_SUBTREE_MINMAX); 306 ERROR_SSL(X509_V_ERR_SUBTREE_MINMAX);
307#endif 307#endif
308#ifdef X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE 308#ifdef X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE
309 ERROR(X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE); 309 ERROR_SSL(X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE);
310#endif 310#endif
311#ifdef X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX 311#ifdef X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX
312 ERROR(X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX); 312 ERROR_SSL(X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX);
313#endif 313#endif
314#ifdef X509_V_ERR_UNSUPPORTED_NAME_SYNTAX 314#ifdef X509_V_ERR_UNSUPPORTED_NAME_SYNTAX
315 ERROR(X509_V_ERR_UNSUPPORTED_NAME_SYNTAX); 315 ERROR_SSL(X509_V_ERR_UNSUPPORTED_NAME_SYNTAX);
316#endif 316#endif
317#ifdef X509_V_ERR_CRL_PATH_VALIDATION_ERROR 317#ifdef X509_V_ERR_CRL_PATH_VALIDATION_ERROR
318 ERROR(X509_V_ERR_CRL_PATH_VALIDATION_ERROR); 318 ERROR_SSL(X509_V_ERR_CRL_PATH_VALIDATION_ERROR);
319#endif 319#endif
320 320
321 /* The application is not happy */ 321 /* The application is not happy */
322#ifdef X509_V_ERR_APPLICATION_VERIFICATION 322#ifdef X509_V_ERR_APPLICATION_VERIFICATION
323 ERROR(X509_V_ERR_APPLICATION_VERIFICATION); 323 ERROR_SSL(X509_V_ERR_APPLICATION_VERIFICATION);
324#endif 324#endif
325 } 325 }
326#undef ERROR 326#undef ERROR_SSL
327} 327}
328 328
329static void 329static void