diff options
| author | Martin Willi <martin@revosec.ch> | 2013-10-11 15:59:37 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2014-06-03 12:24:34 +0200 |
| commit | 40a924090e0350ac10c5f854e7cb96c04c7e1b9e (patch) | |
| tree | 10ffc05c7e4d366bbb8be98668fb8056c48953c6 /src | |
| parent | 43c5388470c66dc0948549af8e4f2d572e23b5f6 (diff) | |
| download | strongswan-40a924090e0350ac10c5f854e7cb96c04c7e1b9e.tar.bz2 strongswan-40a924090e0350ac10c5f854e7cb96c04c7e1b9e.tar.xz | |
crl: Undefine <wincrypt.h>'s CRL_REASON_* and use our enum values instead
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstrongswan/credentials/certificates/crl.h | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/src/libstrongswan/credentials/certificates/crl.h b/src/libstrongswan/credentials/certificates/crl.h index 4191c5935..8a48bd7ff 100644 --- a/src/libstrongswan/credentials/certificates/crl.h +++ b/src/libstrongswan/credentials/certificates/crl.h @@ -28,18 +28,30 @@ typedef enum crl_reason_t crl_reason_t; #include <library.h> #include <credentials/certificates/certificate.h> +/* <wincrypt.h> comes with CRL_REASON clashing with ours. Even if the values + * are identical, we undef them here to use our enum instead of defines. */ +#ifdef WIN32 +# undef CRL_REASON_UNSPECIFIED +# undef CRL_REASON_KEY_COMPROMISE +# undef CRL_REASON_CA_COMPROMISE +# undef CRL_REASON_AFFILIATION_CHANGED +# undef CRL_REASON_SUPERSEDED +# undef CRL_REASON_CERTIFICATE_HOLD +# undef CRL_REASON_REMOVE_FROM_CRL +#endif + /** * RFC 2459 CRL reason codes */ enum crl_reason_t { - CRL_REASON_UNSPECIFIED = 0, - CRL_REASON_KEY_COMPROMISE = 1, - CRL_REASON_CA_COMPROMISE = 2, - CRL_REASON_AFFILIATION_CHANGED = 3, - CRL_REASON_SUPERSEDED = 4, - CRL_REASON_CESSATION_OF_OPERATON = 5, - CRL_REASON_CERTIFICATE_HOLD = 6, - CRL_REASON_REMOVE_FROM_CRL = 8, + CRL_REASON_UNSPECIFIED = 0, + CRL_REASON_KEY_COMPROMISE = 1, + CRL_REASON_CA_COMPROMISE = 2, + CRL_REASON_AFFILIATION_CHANGED = 3, + CRL_REASON_SUPERSEDED = 4, + CRL_REASON_CESSATION_OF_OPERATON = 5, + CRL_REASON_CERTIFICATE_HOLD = 6, + CRL_REASON_REMOVE_FROM_CRL = 8, }; /** |