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/gnutls/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/gnutls/crypto.h')
-rw-r--r-- | include/xmlsec/gnutls/crypto.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/include/xmlsec/gnutls/crypto.h b/include/xmlsec/gnutls/crypto.h index f0e07c6f..fa9dbbcf 100644 --- a/include/xmlsec/gnutls/crypto.h +++ b/include/xmlsec/gnutls/crypto.h @@ -1,5 +1,5 @@ -/** - * XMLSec library +/* + * XML Security Library (http://www.aleksey.com/xmlsec). * * This is free software; see Copyright file in the source * distribution for preciese wording. @@ -9,14 +9,21 @@ #ifndef __XMLSEC_GNUTLS_CRYPTO_H__ #define __XMLSEC_GNUTLS_CRYPTO_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include <xmlsec/xmlsec.h> #include <xmlsec/keys.h> #include <xmlsec/transforms.h> #include <xmlsec/dl.h> +#include <gnutls/gnutls.h> +#ifndef XMLSEC_NO_DSA +#include <gnutls/x509.h> +#endif /* XMLSEC_NO_DSA */ +#ifndef XMLSEC_NO_RSA +#include <gnutls/x509.h> +#endif /* XMLSEC_NO_RSA */ + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ XMLSEC_CRYPTO_EXPORT xmlSecCryptoDLFunctionsPtr xmlSecCryptoGetFunctions_gnutls(void); @@ -152,9 +159,6 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformKWDes3GetKlass(void) *******************************************************************/ #ifndef XMLSEC_NO_DSA -#include <gnutls/gnutls.h> -#include <gnutls/x509.h> - /** * xmlSecGnuTLSKeyDataDsaId: * @@ -284,9 +288,6 @@ XMLSEC_CRYPTO_EXPORT xmlSecTransformId xmlSecGnuTLSTransformHmacSha512GetKlass(v *******************************************************************/ #ifndef XMLSEC_NO_RSA -#include <gnutls/gnutls.h> -#include <gnutls/x509.h> - /** * xmlSecGnuTLSKeyDataRsaId: * |