diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-03-27 10:36:28 +0200 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-03-27 10:36:28 +0200 |
| commit | 66164edf5bdb77d3e60050711998a98f26414997 (patch) | |
| tree | 38ce63eb1b3e7e796e8711edd4ffc2ec6eda6db2 /xmlsecurity/util | |
| parent | ecea2657b023888aa5be5af41876cee03ffa9b27 (diff) | |
mav60: #164341# introduce nss initialization for the case when mscrypto is used
Diffstat (limited to 'xmlsecurity/util')
| -rw-r--r-- | xmlsecurity/util/makefile.mk | 11 | ||||
| -rw-r--r-- | xmlsecurity/util/xsec_xmlsec.windows.component | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk index 75ef30c7c5ac..4f60f4babe0e 100644 --- a/xmlsecurity/util/makefile.mk +++ b/xmlsecurity/util/makefile.mk @@ -83,10 +83,10 @@ SHL2LIBS= \ .IF "$(CRYPTO_ENGINE)" == "mscrypto" SHL2LIBS += \ $(SLB)$/xs_mscrypt.lib -.ELSE +.ENDIF + SHL2LIBS += \ $(SLB)$/xs_nss.lib -.ENDIF .ENDIF @@ -117,19 +117,22 @@ SHL2STDLIBS += $(NSS_LIB) .IF "$(CRYPTO_ENGINE)" == "mscrypto" SHL2STDLIBS+= $(MSCRYPTOLIBS) +# SHL2STDLIBS+= $(XMLSECLIB) $(LIBXML2LIB) $(NSS3LIB) $(NSPR4LIB) $(PLC4LIB) +SHL2STDLIBS+= $(NSS3LIB) $(NSPR4LIB) .ELSE SHL2STDLIBS+= $(NSSCRYPTOLIBS) .ENDIF + SHL2IMPLIB = $(SHL2TARGET) SHL2DEF = $(MISC)$/$(SHL2TARGET).def DEF2NAME = $(SHL2TARGET) .IF "$(CRYPTO_ENGINE)" == "mscrypto" DEF2EXPORTFILE = exports_xsmscrypt.dxp -.ELSE -DEF2EXPORTFILE = exports_xsnss.dxp .ENDIF +DEF2EXPORTFILE = exports_xsnss.dxp + SRSFILELIST= \ $(SRS)$/component.srs \ $(SRS)$/dialogs.srs diff --git a/xmlsecurity/util/xsec_xmlsec.windows.component b/xmlsecurity/util/xsec_xmlsec.windows.component index 58a89af442d4..7b4ef87a9480 100644 --- a/xmlsecurity/util/xsec_xmlsec.windows.component +++ b/xmlsecurity/util/xsec_xmlsec.windows.component @@ -31,7 +31,7 @@ <implementation name="com.sun.star.security.SerialNumberAdapter"> <service name="com.sun.star.security.SerialNumberAdapter"/> </implementation> - <implementation name="com.sun.star.xml.security.bridge.xmlsec.SEInitializer_NssImpl"> + <implementation name="com.sun.star.xml.security.bridge.xmlsec.NSSInitializer_NssImpl"> <service name="com.sun.star.xml.crypto.NSSInitializer"/> </implementation> <implementation name="com.sun.star.xml.security.bridge.xmlsec.SEInitializer_MSCryptImpl"> |