diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-05-21 14:28:57 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-06-21 23:14:49 +0200 |
| commit | 3e3b37ca4cbc881628a71715b67ac172018cf9f2 (patch) | |
| tree | 5f16855d11f1a2910e2f4fbb08078c2aff4c5275 /xmlsecurity/Library_xsec_xmlsec.mk | |
| parent | 814dbf3624b9e8608882b003d96dfb51fa3634fc (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/Library_xsec_xmlsec.mk')
| -rw-r--r-- | xmlsecurity/Library_xsec_xmlsec.mk | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index db161c13995f..639fe55f5add 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -18,6 +18,7 @@ endif $(eval $(call gb_Library_set_include,xsec_xmlsec,\ $$(INCLUDE) \ -I$(SRCDIR)/xmlsecurity/inc \ + -I$(SRCDIR)/xmlsecurity/source/gpg \ -I$(SRCDIR)/xmlsecurity/source/xmlsec \ -I$(call gb_UnpackedTarball_get_dir,xmlsec/include) \ )) @@ -53,6 +54,11 @@ $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ libxml2 \ nss3 \ )) +ifneq ($(filter-out WNT MACOSX ANDROID IOS,$(OS)),) +$(eval $(call gb_Library_use_externals,xsec_xmlsec,\ + gpgmepp \ +)) +endif $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ xmlsecurity/source/xmlsec/biginteger \ @@ -62,6 +68,7 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ xmlsecurity/source/xmlsec/serialnumberadapter \ xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl \ xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl \ + xmlsecurity/source/xmlsec/xmlsec_init \ xmlsecurity/source/xmlsec/xmlstreamio \ xmlsecurity/source/xmlsec/xsec_xmlsec \ xmlsecurity/source/xmlsec/nss/ciphercontext \ @@ -70,6 +77,19 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ xmlsecurity/source/xmlsec/nss/xsec_nss \ )) +ifneq ($(filter-out WNT MACOSX ANDROID IOS,$(OS)),) +$(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ + xmlsecurity/source/gpg/CertificateImpl \ + xmlsecurity/source/gpg/CipherContext \ + xmlsecurity/source/gpg/DigestContext \ + xmlsecurity/source/gpg/SecurityEnvironment \ + xmlsecurity/source/gpg/SEInitializer \ + xmlsecurity/source/gpg/XMLEncryption \ + xmlsecurity/source/gpg/XMLSecurityContext \ + xmlsecurity/source/gpg/xmlsignature_gpgimpl \ +)) +endif + ifeq ($(OS),WNT) $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ |