summaryrefslogtreecommitdiff
path: root/xmlsecurity/inc/xmlsec/xmlstreamio.hxx
diff options
context:
space:
mode:
authorThorsten Behrens <Thorsten.Behrens@CIB.de>2017-05-21 14:28:57 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2017-06-21 23:14:49 +0200
commit3e3b37ca4cbc881628a71715b67ac172018cf9f2 (patch)
tree5f16855d11f1a2910e2f4fbb08078c2aff4c5275 /xmlsecurity/inc/xmlsec/xmlstreamio.hxx
parent814dbf3624b9e8608882b003d96dfb51fa3634fc (diff)
gpg4libre: backport OpenPGP signing from master
This squashes the following commits: - gpg4libre: share static xmlsec lib between nss and gpg - gpg4libre: fix gpg signature generation - gpg4libre: initial GPG signature validation - gpg4libre: Make signature dialog work with two signing services - gpg4libre: Having this dllpublic should be fine now since it's in inc/ - gpg4libre: fix build, explicit ctor call - gpg4libre: now use the gpg security env - gpg4libre: [API-CHANGE] add certificate kind (X509 vs. OpenPGP) - gpg4libre: List both (x509 and gpg) existing signatures - gpg4libre: Init xmlsec in one place before creating the gpg/x509 services - gpg4libre: write PGPData info, get more metadata out for gpg key - gpg4libre: Fixup unit tests, now that SecurityContext is needed - gpg4libre: Make viewing signatures work for gpg signatures - gpg4libre: some code improvements, add metadata for OpenPGP keys - gpg4libre: make signature impl swappable in-situ during validation - gpg4libre: actually take key from user selection - gpg4libre: fix build for windows and mac Change-Id: I3e36b22cefba4c6195bcf8b85b3f7a2cc101b845 Reviewed-on: https://gerrit.libreoffice.org/39076 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'xmlsecurity/inc/xmlsec/xmlstreamio.hxx')
-rw-r--r--xmlsecurity/inc/xmlsec/xmlstreamio.hxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/xmlsecurity/inc/xmlsec/xmlstreamio.hxx b/xmlsecurity/inc/xmlsec/xmlstreamio.hxx
index 55001cbd3ead..9483fdb25475 100644
--- a/xmlsecurity/inc/xmlsec/xmlstreamio.hxx
+++ b/xmlsecurity/inc/xmlsec/xmlstreamio.hxx
@@ -25,13 +25,11 @@
#include <xsecxmlsecdllapi.h>
-int xmlEnableStreamInputCallbacks() ;
-void xmlDisableStreamInputCallbacks() ;
-
+XSECXMLSEC_DLLPUBLIC int xmlEnableStreamInputCallbacks() ;
+XSECXMLSEC_DLLPUBLIC void xmlDisableStreamInputCallbacks() ;
XSECXMLSEC_DLLPUBLIC int xmlRegisterStreamInputCallbacks(
css::uno::Reference< css::xml::crypto::XUriBinding >& aUriBinding
-) ;
-
+);
XSECXMLSEC_DLLPUBLIC int xmlUnregisterStreamInputCallbacks() ;
#endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XMLSTREAMIO_HXX