diff options
| author | sangwan.kwon <sangwan.kwon@samsung.com> | 2016-07-28 15:17:14 +0900 |
|---|---|---|
| committer | sangwan.kwon <sangwan.kwon@samsung.com> | 2016-07-28 15:17:14 +0900 |
| commit | 1ca1a139b4c1a00de4d72f64b7411e118111a161 (patch) | |
| tree | 2c93e5dbce5b42d1efd45520b1c8cd50b6bf6998 /include/xmlsec/xmlsec.h | |
| parent | fe8ea3dba5971ab3f47090ba52d7f824c3d23545 (diff) | |
| parent | d4d35351fd63a7051a7cbef2002cb0c641925ec3 (diff) | |
| download | xmlsec1-1ca1a139b4c1a00de4d72f64b7411e118111a161.tar.gz xmlsec1-1ca1a139b4c1a00de4d72f64b7411e118111a161.tar.bz2 xmlsec1-1ca1a139b4c1a00de4d72f64b7411e118111a161.zip | |
Merge branch 'upstream' into tizen
Change-Id: Iacc73c9ed5e9cfd188df62c405426bfa89bf4e51
Diffstat (limited to 'include/xmlsec/xmlsec.h')
| -rw-r--r-- | include/xmlsec/xmlsec.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/include/xmlsec/xmlsec.h b/include/xmlsec/xmlsec.h index ad44918b..963b37a6 100644 --- a/include/xmlsec/xmlsec.h +++ b/include/xmlsec/xmlsec.h @@ -6,7 +6,7 @@ * This is free software; see Copyright file in the source * distribution for preciese wording. * - * Copyright (C) 2002-2003 Aleksey Sanin <aleksey@aleksey.com> + * Copyright (C) 2002-2016 Aleksey Sanin <aleksey@aleksey.com>. All Rights Reserved. */ #ifndef __XMLSEC_H__ #define __XMLSEC_H__ @@ -83,14 +83,19 @@ typedef struct _xmlSecDSigCtx xmlSecDSigCtx, *xmlSecDSigCtxPtr typedef struct _xmlSecEncCtx xmlSecEncCtx, *xmlSecEncCtxPtr; #endif /* XMLSEC_NO_XMLENC */ -#ifndef XMLSEC_NO_XKMS -typedef struct _xmlSecXkmsServerCtx xmlSecXkmsServerCtx, *xmlSecXkmsServerCtxPtr; -#endif /* XMLSEC_NO_XKMS */ - -XMLSEC_EXPORT int xmlSecInit (void); -XMLSEC_EXPORT int xmlSecShutdown (void); - +XMLSEC_EXPORT int xmlSecInit (void); +XMLSEC_EXPORT int xmlSecShutdown (void); +XMLSEC_EXPORT const xmlChar * xmlSecGetDefaultCrypto (void); +/** + * XMLSEC_CRYPTO: + * + * Macro. Deprecated. Defined for backward compatibility only. Do not use + * in your code and use xmlSecGetDefaultCrypto() function instead. + * + * Returns the default crypto engine. + */ +#define XMLSEC_CRYPTO (xmlSecGetDefaultCrypto()) /*********************************************************************** * |