cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2712260d751480e82d5329ff435570b902aa05be
commit 2712260d751480e82d5329ff435570b902aa05be
Author: Vincent Torri <vincent dot torri at gmail dot com>
Date: Sat Nov 7 14:08:32 2015 +0100
ecore_con: fix warning on Windows
The macro ERROR is already defined on Windows, renaming it to ERROR_SSL.
Signed-off-by: Cedric BAIL <[email protected]>
---
src/lib/ecore_con/ecore_con_ssl.c | 110 +++++++++++++++++++-------------------
1 file 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 d66262d..f16dd69 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)
{
switch (error)
{
-#define ERROR(X) \
+#define ERROR_SSL(X) \
case (X): \
ERR("%s", #X); \
break
#ifdef X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT
- ERROR(X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT);
+ ERROR_SSL(X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT);
#endif
#ifdef X509_V_ERR_UNABLE_TO_GET_CRL
- ERROR(X509_V_ERR_UNABLE_TO_GET_CRL);
+ ERROR_SSL(X509_V_ERR_UNABLE_TO_GET_CRL);
#endif
#ifdef X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE
- ERROR(X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE);
+ ERROR_SSL(X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE);
#endif
#ifdef X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE
- ERROR(X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE);
+ ERROR_SSL(X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE);
#endif
#ifdef X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY
- ERROR(X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY);
+ ERROR_SSL(X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY);
#endif
#ifdef X509_V_ERR_CERT_SIGNATURE_FAILURE
- ERROR(X509_V_ERR_CERT_SIGNATURE_FAILURE);
+ ERROR_SSL(X509_V_ERR_CERT_SIGNATURE_FAILURE);
#endif
#ifdef X509_V_ERR_CRL_SIGNATURE_FAILURE
- ERROR(X509_V_ERR_CRL_SIGNATURE_FAILURE);
+ ERROR_SSL(X509_V_ERR_CRL_SIGNATURE_FAILURE);
#endif
#ifdef X509_V_ERR_CERT_NOT_YET_VALID
- ERROR(X509_V_ERR_CERT_NOT_YET_VALID);
+ ERROR_SSL(X509_V_ERR_CERT_NOT_YET_VALID);
#endif
#ifdef X509_V_ERR_CERT_HAS_EXPIRED
- ERROR(X509_V_ERR_CERT_HAS_EXPIRED);
+ ERROR_SSL(X509_V_ERR_CERT_HAS_EXPIRED);
#endif
#ifdef X509_V_ERR_CRL_NOT_YET_VALID
- ERROR(X509_V_ERR_CRL_NOT_YET_VALID);
+ ERROR_SSL(X509_V_ERR_CRL_NOT_YET_VALID);
#endif
#ifdef X509_V_ERR_CRL_HAS_EXPIRED
- ERROR(X509_V_ERR_CRL_HAS_EXPIRED);
+ ERROR_SSL(X509_V_ERR_CRL_HAS_EXPIRED);
#endif
#ifdef X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD
- ERROR(X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD);
+ ERROR_SSL(X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD);
#endif
#ifdef X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD
- ERROR(X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD);
+ ERROR_SSL(X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD);
#endif
#ifdef X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD
- ERROR(X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD);
+ ERROR_SSL(X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD);
#endif
#ifdef X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD
- ERROR(X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD);
+ ERROR_SSL(X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD);
#endif
#ifdef X509_V_ERR_OUT_OF_MEM
- ERROR(X509_V_ERR_OUT_OF_MEM);
+ ERROR_SSL(X509_V_ERR_OUT_OF_MEM);
#endif
#ifdef X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT
- ERROR(X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT);
+ ERROR_SSL(X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT);
#endif
#ifdef X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN
- ERROR(X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN);
+ ERROR_SSL(X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN);
#endif
#ifdef X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY
- ERROR(X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY);
+ ERROR_SSL(X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY);
#endif
#ifdef X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE
- ERROR(X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE);
+ ERROR_SSL(X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE);
#endif
#ifdef X509_V_ERR_CERT_CHAIN_TOO_LONG
- ERROR(X509_V_ERR_CERT_CHAIN_TOO_LONG);
+ ERROR_SSL(X509_V_ERR_CERT_CHAIN_TOO_LONG);
#endif
#ifdef X509_V_ERR_CERT_REVOKED
- ERROR(X509_V_ERR_CERT_REVOKED);
+ ERROR_SSL(X509_V_ERR_CERT_REVOKED);
#endif
#ifdef X509_V_ERR_INVALID_CA
- ERROR(X509_V_ERR_INVALID_CA);
+ ERROR_SSL(X509_V_ERR_INVALID_CA);
#endif
#ifdef X509_V_ERR_PATH_LENGTH_EXCEEDED
- ERROR(X509_V_ERR_PATH_LENGTH_EXCEEDED);
+ ERROR_SSL(X509_V_ERR_PATH_LENGTH_EXCEEDED);
#endif
#ifdef X509_V_ERR_INVALID_PURPOSE
- ERROR(X509_V_ERR_INVALID_PURPOSE);
+ ERROR_SSL(X509_V_ERR_INVALID_PURPOSE);
#endif
#ifdef X509_V_ERR_CERT_UNTRUSTED
- ERROR(X509_V_ERR_CERT_UNTRUSTED);
+ ERROR_SSL(X509_V_ERR_CERT_UNTRUSTED);
#endif
#ifdef X509_V_ERR_CERT_REJECTED
- ERROR(X509_V_ERR_CERT_REJECTED);
+ ERROR_SSL(X509_V_ERR_CERT_REJECTED);
#endif
/* These are 'informational' when looking for issuer cert */
#ifdef X509_V_ERR_SUBJECT_ISSUER_MISMATCH
- ERROR(X509_V_ERR_SUBJECT_ISSUER_MISMATCH);
+ ERROR_SSL(X509_V_ERR_SUBJECT_ISSUER_MISMATCH);
#endif
#ifdef X509_V_ERR_AKID_SKID_MISMATCH
- ERROR(X509_V_ERR_AKID_SKID_MISMATCH);
+ ERROR_SSL(X509_V_ERR_AKID_SKID_MISMATCH);
#endif
#ifdef X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH
- ERROR(X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH);
+ ERROR_SSL(X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH);
#endif
#ifdef X509_V_ERR_KEYUSAGE_NO_CERTSIGN
- ERROR(X509_V_ERR_KEYUSAGE_NO_CERTSIGN);
+ ERROR_SSL(X509_V_ERR_KEYUSAGE_NO_CERTSIGN);
#endif
#ifdef X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER
- ERROR(X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER);
+ ERROR_SSL(X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER);
#endif
#ifdef X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION
- ERROR(X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION);
+ ERROR_SSL(X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION);
#endif
#ifdef X509_V_ERR_KEYUSAGE_NO_CRL_SIGN
- ERROR(X509_V_ERR_KEYUSAGE_NO_CRL_SIGN);
+ ERROR_SSL(X509_V_ERR_KEYUSAGE_NO_CRL_SIGN);
#endif
#ifdef X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION
- ERROR(X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION);
+ ERROR_SSL(X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION);
#endif
#ifdef X509_V_ERR_INVALID_NON_CA
- ERROR(X509_V_ERR_INVALID_NON_CA);
+ ERROR_SSL(X509_V_ERR_INVALID_NON_CA);
#endif
#ifdef X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED
- ERROR(X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED);
+ ERROR_SSL(X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED);
#endif
#ifdef X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE
- ERROR(X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE);
+ ERROR_SSL(X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE);
#endif
#ifdef X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED
- ERROR(X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED);
+ ERROR_SSL(X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED);
#endif
#ifdef X509_V_ERR_INVALID_EXTENSION
- ERROR(X509_V_ERR_INVALID_EXTENSION);
+ ERROR_SSL(X509_V_ERR_INVALID_EXTENSION);
#endif
#ifdef X509_V_ERR_INVALID_POLICY_EXTENSION
- ERROR(X509_V_ERR_INVALID_POLICY_EXTENSION);
+ ERROR_SSL(X509_V_ERR_INVALID_POLICY_EXTENSION);
#endif
#ifdef X509_V_ERR_NO_EXPLICIT_POLICY
- ERROR(X509_V_ERR_NO_EXPLICIT_POLICY);
+ ERROR_SSL(X509_V_ERR_NO_EXPLICIT_POLICY);
#endif
#ifdef X509_V_ERR_DIFFERENT_CRL_SCOPE
- ERROR(X509_V_ERR_DIFFERENT_CRL_SCOPE);
+ ERROR_SSL(X509_V_ERR_DIFFERENT_CRL_SCOPE);
#endif
#ifdef X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE
- ERROR(X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE);
+ ERROR_SSL(X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE);
#endif
#ifdef X509_V_ERR_UNNESTED_RESOURCE
- ERROR(X509_V_ERR_UNNESTED_RESOURCE);
+ ERROR_SSL(X509_V_ERR_UNNESTED_RESOURCE);
#endif
#ifdef X509_V_ERR_PERMITTED_VIOLATION
- ERROR(X509_V_ERR_PERMITTED_VIOLATION);
+ ERROR_SSL(X509_V_ERR_PERMITTED_VIOLATION);
#endif
#ifdef X509_V_ERR_EXCLUDED_VIOLATION
- ERROR(X509_V_ERR_EXCLUDED_VIOLATION);
+ ERROR_SSL(X509_V_ERR_EXCLUDED_VIOLATION);
#endif
#ifdef X509_V_ERR_SUBTREE_MINMAX
- ERROR(X509_V_ERR_SUBTREE_MINMAX);
+ ERROR_SSL(X509_V_ERR_SUBTREE_MINMAX);
#endif
#ifdef X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE
- ERROR(X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE);
+ ERROR_SSL(X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE);
#endif
#ifdef X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX
- ERROR(X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX);
+ ERROR_SSL(X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX);
#endif
#ifdef X509_V_ERR_UNSUPPORTED_NAME_SYNTAX
- ERROR(X509_V_ERR_UNSUPPORTED_NAME_SYNTAX);
+ ERROR_SSL(X509_V_ERR_UNSUPPORTED_NAME_SYNTAX);
#endif
#ifdef X509_V_ERR_CRL_PATH_VALIDATION_ERROR
- ERROR(X509_V_ERR_CRL_PATH_VALIDATION_ERROR);
+ ERROR_SSL(X509_V_ERR_CRL_PATH_VALIDATION_ERROR);
#endif
/* The application is not happy */
#ifdef X509_V_ERR_APPLICATION_VERIFICATION
- ERROR(X509_V_ERR_APPLICATION_VERIFICATION);
+ ERROR_SSL(X509_V_ERR_APPLICATION_VERIFICATION);
#endif
}
-#undef ERROR
+#undef ERROR_SSL
}
static void
--
