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 22:16:55 +0200 |
| commit | 06d7dbb3568889aa50f46d6307a39fa53a17313b (patch) | |
| tree | 0eb4ef2f4e7e4dbc443352330164096053e90881 /xmlsecurity/util | |
| parent | f172c37f8f51d0f6a323045828e5b1b434fe6735 (diff) | |
gpg4libre: share static xmlsec lib between nss and gpg
In the end, the gpgme implementation uses enough of xmlsec
functionality that splitting those (and ending up with two copies)
was just not worth it.
Change-Id: Ida87c848e4e6a770e3c697add9ceb589a9ec3930
Diffstat (limited to 'xmlsecurity/util')
| -rw-r--r-- | xmlsecurity/util/xsec_gpg.component | 25 | ||||
| -rw-r--r-- | xmlsecurity/util/xsec_xmlsec.component | 3 |
2 files changed, 3 insertions, 25 deletions
diff --git a/xmlsecurity/util/xsec_gpg.component b/xmlsecurity/util/xsec_gpg.component deleted file mode 100644 index bf24f36953ca..000000000000 --- a/xmlsecurity/util/xsec_gpg.component +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - --> - -<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" - prefix="xsec_gpg" xmlns="http://openoffice.org/2010/uno-components"> - <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLSignature_GpgImpl"> - <service name="com.sun.star.xml.crypto.XMLSignature2"/> - </implementation> -</component> diff --git a/xmlsecurity/util/xsec_xmlsec.component b/xmlsecurity/util/xsec_xmlsec.component index cf0bc54dc4e2..0f990ad1d304 100644 --- a/xmlsecurity/util/xsec_xmlsec.component +++ b/xmlsecurity/util/xsec_xmlsec.component @@ -22,6 +22,9 @@ <implementation name="com.sun.star.comp.security.SerialNumberAdapter"> <service name="com.sun.star.security.SerialNumberAdapter"/> </implementation> + <implementation name="com.sun.star.xml.security.bridge.xmlsec.XMLSignature_GpgImpl"> + <service name="com.sun.star.xml.crypto.XMLSignature2"/> + </implementation> <implementation name="com.sun.star.xml.security.bridge.xmlsec.SEInitializer_NssImpl"> <service name="com.sun.star.xml.crypto.NSSInitializer"/> <service name="com.sun.star.xml.crypto.SEInitializer"/> |