diff options
author | Yves-Alexis Perez <corsac@debian.org> | 2014-07-11 07:23:31 +0200 |
---|---|---|
committer | Yves-Alexis Perez <corsac@debian.org> | 2014-07-11 07:23:31 +0200 |
commit | 81c63b0eed39432878f78727f60a1e7499645199 (patch) | |
tree | 82387d8fecd1c20788fd8bd784a9b0bde091fb6b /src/libstrongswan/credentials/certificates/crl.h | |
parent | c5ebfc7b9c16551fe825dc1d79c3f7e2f096f6c9 (diff) | |
download | vyos-strongswan-81c63b0eed39432878f78727f60a1e7499645199.tar.gz vyos-strongswan-81c63b0eed39432878f78727f60a1e7499645199.zip |
Imported Upstream version 5.2.0
Diffstat (limited to 'src/libstrongswan/credentials/certificates/crl.h')
-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, }; /** |