diff options
| author | Konrad Lipinski <k.lipinski2@partner.samsung.com> | 2019-06-11 16:25:51 +0200 |
|---|---|---|
| committer | Konrad Lipinski <k.lipinski2@samsung.com> | 2019-08-01 14:37:53 +0200 |
| commit | cc6febdd37186eeea33bcbce89d79f661ee0009f (patch) | |
| tree | 100542f7f8fd3b3c9548150362efe35adde47551 /include/xmlsec/crypto.h | |
| parent | c40fbfa8503e7763ef630496852f4d6b5e63b58c (diff) | |
| download | xmlsec1-cc6febdd37186eeea33bcbce89d79f661ee0009f.tar.gz xmlsec1-cc6febdd37186eeea33bcbce89d79f661ee0009f.tar.bz2 xmlsec1-cc6febdd37186eeea33bcbce89d79f661ee0009f.zip | |
Import upstream commit c4d0493d545b99194eea1b2b058930d5a9bb91b1 (1.2.28)
Change-Id: I10f71567cb140be223923e1cd0b5895e366ac23e
Diffstat (limited to 'include/xmlsec/crypto.h')
| -rw-r--r-- | include/xmlsec/crypto.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/include/xmlsec/crypto.h b/include/xmlsec/crypto.h index 75d92d04..8f138396 100644 --- a/include/xmlsec/crypto.h +++ b/include/xmlsec/crypto.h @@ -1,4 +1,4 @@ -/** +/* * XML Security Library (http://www.aleksey.com/xmlsec). * * Crypto engine selection. @@ -11,10 +11,6 @@ #ifndef __XMLSEC_CRYPTO_H__ #define __XMLSEC_CRYPTO_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include <xmlsec/xmlsec.h> /* include nothing if we compile xmlsec library itself */ @@ -40,6 +36,12 @@ extern "C" { #include <xmlsec/mscrypto/x509.h> #include <xmlsec/mscrypto/symbols.h> #else /* XMLSEC_CRYPTO_MSCRYPTO */ +#ifdef XMLSEC_CRYPTO_MSCNG +#include <xmlsec/mscng/app.h> +#include <xmlsec/mscng/crypto.h> +#include <xmlsec/mscng/x509.h> +#include <xmlsec/mscng/symbols.h> +#else /* XMLSEC_CRYPTO_MSCNG */ #ifdef XMLSEC_CRYPTO_NSS #include <xmlsec/nss/app.h> #include <xmlsec/nss/crypto.h> @@ -60,6 +62,7 @@ extern "C" { #endif /* XMLSEC_CRYPTO_GCRYPT */ #endif /* XMLSEC_CRYPTO_GNUTLS */ #endif /* XMLSEC_CRYPTO_NSS */ +#endif /* XMLSEC_CRYPTO_MSCNG */ #endif /* XMLSEC_CRYPTO_MSCRYPTO */ #endif /* XMLSEC_CRYPTO_OPENSSL */ #endif /* XMLSEC_CRYPTO_DYNAMIC_LOADING */ @@ -67,9 +70,5 @@ extern "C" { #endif /* IN_XMLSEC_CRYPTO */ #endif /* IN_XMLSEC */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ - #endif /* __XMLSEC_CRYPTO_H__ */ |