kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ecore_con: fix warning on Windows 

The macro ERROR is already defined on Windows, renaming it to ERROR_SSL.

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
Vincent Torri 2015-11-07 14:08:32 +01:00 committed by Cedric BAIL
parent 9eef7ae287
commit 2712260d75
1 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
src/lib/ecore_con/ecore_con_ssl.c
View File

@ -152,178 +152,178 @@ _openssl_print_verify_error(int error)
{ {
switch (error) switch (error)
{ {
#define ERROR(X) \ #define ERROR_SSL(X) \
case (X): \ case (X): \
ERR("%s", #X); \ ERR("%s", #X); \
break break
#ifdef X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT #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 #endif
#ifdef X509_V_ERR_UNABLE_TO_GET_CRL #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 #endif
#ifdef X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE #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 #endif
#ifdef X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE #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 #endif
#ifdef X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY #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 #endif
#ifdef X509_V_ERR_CERT_SIGNATURE_FAILURE #ifdef X509_V_ERR_CERT_SIGNATURE_FAILURE
ERROR(X509_V_ERR_CERT_SIGNATURE_FAILURE); ERROR_SSL(X509_V_ERR_CERT_SIGNATURE_FAILURE);
#endif #endif
#ifdef X509_V_ERR_CRL_SIGNATURE_FAILURE #ifdef X509_V_ERR_CRL_SIGNATURE_FAILURE
ERROR(X509_V_ERR_CRL_SIGNATURE_FAILURE); ERROR_SSL(X509_V_ERR_CRL_SIGNATURE_FAILURE);
#endif #endif
#ifdef X509_V_ERR_CERT_NOT_YET_VALID #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 #endif
#ifdef X509_V_ERR_CERT_HAS_EXPIRED #ifdef X509_V_ERR_CERT_HAS_EXPIRED
ERROR(X509_V_ERR_CERT_HAS_EXPIRED); ERROR_SSL(X509_V_ERR_CERT_HAS_EXPIRED);
#endif #endif
#ifdef X509_V_ERR_CRL_NOT_YET_VALID #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 #endif
#ifdef X509_V_ERR_CRL_HAS_EXPIRED #ifdef X509_V_ERR_CRL_HAS_EXPIRED
ERROR(X509_V_ERR_CRL_HAS_EXPIRED); ERROR_SSL(X509_V_ERR_CRL_HAS_EXPIRED);
#endif #endif
#ifdef X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD #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 #endif
#ifdef X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD #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 #endif
#ifdef X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD #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 #endif
#ifdef X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD #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 #endif
#ifdef X509_V_ERR_OUT_OF_MEM #ifdef X509_V_ERR_OUT_OF_MEM
ERROR(X509_V_ERR_OUT_OF_MEM); ERROR_SSL(X509_V_ERR_OUT_OF_MEM);
#endif #endif
#ifdef X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT #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 #endif
#ifdef X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN #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 #endif
#ifdef X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY #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 #endif
#ifdef X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE #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 #endif
#ifdef X509_V_ERR_CERT_CHAIN_TOO_LONG #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 #endif
#ifdef X509_V_ERR_CERT_REVOKED #ifdef X509_V_ERR_CERT_REVOKED
ERROR(X509_V_ERR_CERT_REVOKED); ERROR_SSL(X509_V_ERR_CERT_REVOKED);
#endif #endif
#ifdef X509_V_ERR_INVALID_CA #ifdef X509_V_ERR_INVALID_CA
ERROR(X509_V_ERR_INVALID_CA); ERROR_SSL(X509_V_ERR_INVALID_CA);
#endif #endif
#ifdef X509_V_ERR_PATH_LENGTH_EXCEEDED #ifdef X509_V_ERR_PATH_LENGTH_EXCEEDED
ERROR(X509_V_ERR_PATH_LENGTH_EXCEEDED); ERROR_SSL(X509_V_ERR_PATH_LENGTH_EXCEEDED);
#endif #endif
#ifdef X509_V_ERR_INVALID_PURPOSE #ifdef X509_V_ERR_INVALID_PURPOSE
ERROR(X509_V_ERR_INVALID_PURPOSE); ERROR_SSL(X509_V_ERR_INVALID_PURPOSE);
#endif #endif
#ifdef X509_V_ERR_CERT_UNTRUSTED #ifdef X509_V_ERR_CERT_UNTRUSTED
ERROR(X509_V_ERR_CERT_UNTRUSTED); ERROR_SSL(X509_V_ERR_CERT_UNTRUSTED);
#endif #endif
#ifdef X509_V_ERR_CERT_REJECTED #ifdef X509_V_ERR_CERT_REJECTED
ERROR(X509_V_ERR_CERT_REJECTED); ERROR_SSL(X509_V_ERR_CERT_REJECTED);
#endif #endif
/* These are 'informational' when looking for issuer cert */ /* These are 'informational' when looking for issuer cert */
#ifdef X509_V_ERR_SUBJECT_ISSUER_MISMATCH #ifdef X509_V_ERR_SUBJECT_ISSUER_MISMATCH
ERROR(X509_V_ERR_SUBJECT_ISSUER_MISMATCH); ERROR_SSL(X509_V_ERR_SUBJECT_ISSUER_MISMATCH);
#endif #endif
#ifdef X509_V_ERR_AKID_SKID_MISMATCH #ifdef X509_V_ERR_AKID_SKID_MISMATCH
ERROR(X509_V_ERR_AKID_SKID_MISMATCH); ERROR_SSL(X509_V_ERR_AKID_SKID_MISMATCH);
#endif #endif
#ifdef X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH #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 #endif
#ifdef X509_V_ERR_KEYUSAGE_NO_CERTSIGN #ifdef X509_V_ERR_KEYUSAGE_NO_CERTSIGN
ERROR(X509_V_ERR_KEYUSAGE_NO_CERTSIGN); ERROR_SSL(X509_V_ERR_KEYUSAGE_NO_CERTSIGN);
#endif #endif
#ifdef X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER #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 #endif
#ifdef X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION #ifdef X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION
ERROR(X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION); ERROR_SSL(X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION);
#endif #endif
#ifdef X509_V_ERR_KEYUSAGE_NO_CRL_SIGN #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 #endif
#ifdef X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION #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 #endif
#ifdef X509_V_ERR_INVALID_NON_CA #ifdef X509_V_ERR_INVALID_NON_CA
ERROR(X509_V_ERR_INVALID_NON_CA); ERROR_SSL(X509_V_ERR_INVALID_NON_CA);
#endif #endif
#ifdef X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED #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 #endif
#ifdef X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE #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 #endif
#ifdef X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED #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 #endif
#ifdef X509_V_ERR_INVALID_EXTENSION #ifdef X509_V_ERR_INVALID_EXTENSION
ERROR(X509_V_ERR_INVALID_EXTENSION); ERROR_SSL(X509_V_ERR_INVALID_EXTENSION);
#endif #endif
#ifdef X509_V_ERR_INVALID_POLICY_EXTENSION #ifdef X509_V_ERR_INVALID_POLICY_EXTENSION
ERROR(X509_V_ERR_INVALID_POLICY_EXTENSION); ERROR_SSL(X509_V_ERR_INVALID_POLICY_EXTENSION);
#endif #endif
#ifdef X509_V_ERR_NO_EXPLICIT_POLICY #ifdef X509_V_ERR_NO_EXPLICIT_POLICY
ERROR(X509_V_ERR_NO_EXPLICIT_POLICY); ERROR_SSL(X509_V_ERR_NO_EXPLICIT_POLICY);
#endif #endif
#ifdef X509_V_ERR_DIFFERENT_CRL_SCOPE #ifdef X509_V_ERR_DIFFERENT_CRL_SCOPE
ERROR(X509_V_ERR_DIFFERENT_CRL_SCOPE); ERROR_SSL(X509_V_ERR_DIFFERENT_CRL_SCOPE);
#endif #endif
#ifdef X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE #ifdef X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE
ERROR(X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE); ERROR_SSL(X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE);
#endif #endif
#ifdef X509_V_ERR_UNNESTED_RESOURCE #ifdef X509_V_ERR_UNNESTED_RESOURCE
ERROR(X509_V_ERR_UNNESTED_RESOURCE); ERROR_SSL(X509_V_ERR_UNNESTED_RESOURCE);
#endif #endif
#ifdef X509_V_ERR_PERMITTED_VIOLATION #ifdef X509_V_ERR_PERMITTED_VIOLATION
ERROR(X509_V_ERR_PERMITTED_VIOLATION); ERROR_SSL(X509_V_ERR_PERMITTED_VIOLATION);
#endif #endif
#ifdef X509_V_ERR_EXCLUDED_VIOLATION #ifdef X509_V_ERR_EXCLUDED_VIOLATION
ERROR(X509_V_ERR_EXCLUDED_VIOLATION); ERROR_SSL(X509_V_ERR_EXCLUDED_VIOLATION);
#endif #endif
#ifdef X509_V_ERR_SUBTREE_MINMAX #ifdef X509_V_ERR_SUBTREE_MINMAX
ERROR(X509_V_ERR_SUBTREE_MINMAX); ERROR_SSL(X509_V_ERR_SUBTREE_MINMAX);
#endif #endif
#ifdef X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE #ifdef X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE
ERROR(X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE); ERROR_SSL(X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE);
#endif #endif
#ifdef X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX #ifdef X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX
ERROR(X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX); ERROR_SSL(X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX);
#endif #endif
#ifdef X509_V_ERR_UNSUPPORTED_NAME_SYNTAX #ifdef X509_V_ERR_UNSUPPORTED_NAME_SYNTAX
ERROR(X509_V_ERR_UNSUPPORTED_NAME_SYNTAX); ERROR_SSL(X509_V_ERR_UNSUPPORTED_NAME_SYNTAX);
#endif #endif
#ifdef X509_V_ERR_CRL_PATH_VALIDATION_ERROR #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 #endif
/* The application is not happy */ /* The application is not happy */
#ifdef X509_V_ERR_APPLICATION_VERIFICATION #ifdef X509_V_ERR_APPLICATION_VERIFICATION
ERROR(X509_V_ERR_APPLICATION_VERIFICATION); ERROR_SSL(X509_V_ERR_APPLICATION_VERIFICATION);
#endif #endif
} }
#undef ERROR #undef ERROR_SSL
} }
static void static void