[PATCH 5/5] remove dead code in components xmlsec nss
pjacquod
pjacquod at alumni.ethz.ch
Sun Nov 21 03:50:29 PST 2010
---
forms/source/xforms/xpathlib/extension.cxx | 3 -
forms/source/xforms/xpathlib/xpathlib.hxx | 27 ----
.../xmlsec/nss/securityenvironment_nssimpl.cxx | 23 ----
.../source/xmlsec/nss/xmlencryption_nssimpl.cxx | 37 ------
.../xmlsec/nss/xmlsecuritycontext_nssimpl.cxx | 127 +-------------------
.../source/xmlsec/nss/xmlsignature_nssimpl.cxx | 6 +-
6 files changed, 3 insertions(+), 220 deletions(-)
diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx
index 8c29f0f..89d8790 100644
--- a/forms/source/xforms/xpathlib/extension.cxx
+++ b/forms/source/xforms/xpathlib/extension.cxx
@@ -46,20 +46,17 @@ using com::sun::star::xml::dom::XNode;
Reference< XInterface > SAL_CALL CLibxml2XFormsExtension::Create(
const Reference< XMultiServiceFactory >& /*aFactory*/)
{
- // printf("_create_\n");
Reference< XInterface > aInstance(static_cast< XXPathExtension* >(new CLibxml2XFormsExtension(/*aFactory*/)));
return aInstance;
}
::rtl::OUString SAL_CALL CLibxml2XFormsExtension::getImplementationName_Static()
{
- // printf("_implname_\n");
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.xml.xpath.XFormsExtension") );
}
Sequence< ::rtl::OUString > SAL_CALL CLibxml2XFormsExtension::getSupportedServiceNames_Static()
{
- // printf("_services_\n");
Sequence< ::rtl::OUString > aSequence(1);
aSequence[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xpath.XPathExtension") );
return aSequence;
diff --git a/forms/source/xforms/xpathlib/xpathlib.hxx b/forms/source/xforms/xpathlib/xpathlib.hxx
index 109f328..2a74c18 100644
--- a/forms/source/xforms/xpathlib/xpathlib.hxx
+++ b/forms/source/xforms/xpathlib/xpathlib.hxx
@@ -16,38 +16,11 @@
* An XPath parser context. It contains pure parsing informations,
* an xmlXPathContext, and the stack of objects.
*/
-#if 0
-// for reference from xpath.h
-struct _xmlXPathParserContext {
- const xmlChar *cur; /* the current char being parsed */
- const xmlChar *base; /* the full expression */
-
- int error; /* error code */
-
- xmlXPathContextPtr context; /* the evaluation context */
- xmlXPathObjectPtr value; /* the current value */
- int valueNr; /* number of values stacked */
- int valueMax; /* max number of values stacked */
- xmlXPathObjectPtr *valueTab; /* stack of values */
-
- xmlXPathCompExprPtr comp; /* the precompiled expression */
- int xptr; /* it this an XPointer expression */
- xmlNodePtr ancestor; /* used for walking preceding axis */
-};
-
-#endif
extern "C"
{
// XForms
-/*
-void xforms_getInstanceDocumentFunction(xmlXPathParserContextPtr ctxt, int nargs);
-void xforms_rebuildFunction(xmlXPathParserContextPtr ctxt, int nargs);
-void xforms_recalculateFunction(xmlXPathParserContextPtr ctxt, int nargs);
-void xforms_revalidateFunction(xmlXPathParserContextPtr ctxt, int nargs);
-void xforms_refreshFunction(xmlXPathParserContextPtr ctxt, int nargs);
-*/
// XForms Core Functions
// boolean functions
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 3643491..3ae1a7b 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -584,29 +584,6 @@ Reference< XCertificate > SecurityEnvironment_NssImpl :: getCertificate( const O
* is not useful at all. (comment out now)
*/
- /*
- sal_Int32 nIndex = 0;
- OUString newIssuerName;
- do
- {
- OUString aToken = issuerName.getToken( 0, ',', nIndex ).trim();
- if (aToken.compareToAscii("S=",2) == 0)
- {
- newIssuerName+=OUString::createFromAscii("ST=");
- newIssuerName+=aToken.copy(2);
- }
- else
- {
- newIssuerName+=aToken;
- }
-
- if (nIndex >= 0)
- {
- newIssuerName+=OUString::createFromAscii(",");
- }
- } while ( nIndex >= 0 );
- */
-
/* end */
//Create cert info from issue and serial
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
index 8a5cb3c..4810902 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
@@ -99,12 +99,6 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
throw RuntimeException() ;
}
-#if 0
- XMLSecurityContext_NssImpl* pSecCtxt = ( XMLSecurityContext_NssImpl* )xSecTunnel->getSomething( XMLSecurityContext_NssImpl::getUnoTunnelId() ) ;
- if( pSecCtxt == NULL )
- throw RuntimeException() ;
-#endif
-
SecurityEnvironment_NssImpl* pSecEnv =
reinterpret_cast<SecurityEnvironment_NssImpl*>(
sal::static_int_cast<sal_uIntPtr>(xSecTunnel->getSomething( SecurityEnvironment_NssImpl::getUnoTunnelId() ))) ;
@@ -156,11 +150,6 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
throw XMLEncryptionException() ;
}
- /* MM : remove the following 2 lines
- xmlUnlinkNode(pContent);
- xmlAddNextSibling(pEncryptedData, pContent);
- */
-
//remember the position of the element to be signed
sal_Bool isParentRef = sal_True;
xmlNodePtr pParent = pEncryptedData->parent;
@@ -196,32 +185,6 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt(
pEncryptedData = pTemplate->getNativeElement() ;
//Find the element to be encrypted.
- /* MM : remove the old method to get the target element
- //This element is wrapped in the CipherValue sub-element.
- xmlNodePtr pCipherData = pEncryptedData->children;
- while (pCipherData != NULL && stricmp((const char *)(pCipherData->name), "CipherData"))
- {
- pCipherData = pCipherData->next;
- }
-
- if( pCipherData == NULL ) {
- xmlSecEncCtxDestroy( pEncCtx ) ;
- throw XMLEncryptionException() ;
- }
-
- xmlNodePtr pCipherValue = pCipherData->children;
- while (pCipherValue != NULL && stricmp((const char *)(pCipherValue->name), "CipherValue"))
- {
- pCipherValue = pCipherValue->next;
- }
-
- if( pCipherValue == NULL ) {
- xmlSecEncCtxDestroy( pEncCtx ) ;
- throw XMLEncryptionException() ;
- }
-
- pContent = pCipherValue->children;
- */
//Encrypt the template
if( xmlSecEncCtxXmlEncrypt( pEncCtx , pEncryptedData , pContent ) < 0 )
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
index 9b6ed2d..386f438 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx
@@ -79,11 +79,7 @@ XMLSecurityContext_NssImpl :: XMLSecurityContext_NssImpl( const Reference< XMult
}
XMLSecurityContext_NssImpl :: ~XMLSecurityContext_NssImpl() {
-#if 0 //i39448
- if( m_pKeysMngr != NULL ) {
- xmlSecKeysMngrDestroy( m_pKeysMngr ) ;
- }
-#endif
+ //i39448
xmlDisableStreamInputCallbacks() ;
xmlSecCryptoShutdown() ;
@@ -150,86 +146,7 @@ void SAL_CALL XMLSecurityContext_NssImpl::setDefaultSecurityEnvironmentIndex( sa
m_nDefaultEnvIndex = nDefaultEnvIndex;
}
-#if 0 //i39448 : old methods should be deleted
-/* XXMLSecurityContext */
-void SAL_CALL XMLSecurityContext_NssImpl :: setSecurityEnvironment( const Reference< XSecurityEnvironment >& aSecurityEnvironment ) throw( com::sun::star::security::SecurityInfrastructureException ) {
- PK11SlotInfo* slot ;
- CERTCertDBHandle* handler ;
- //xmlSecKeyPtr key ;
- //xmlSecKeyDataPtr keyData ;
- PK11SymKey* symKey ;
- SECKEYPublicKey* pubKey ;
- SECKEYPrivateKey* priKey ;
- unsigned int i ;
-
- if( !aSecurityEnvironment.is() )
- throw RuntimeException() ;
-
- m_xSecurityEnvironment = aSecurityEnvironment ;
-
- //Clear key manager
- if( m_pKeysMngr != NULL ) {
- xmlSecKeysMngrDestroy( m_pKeysMngr ) ;
- m_pKeysMngr = NULL ;
- }
-
- //Create key manager
- Reference< XUnoTunnel > xEnvTunnel( m_xSecurityEnvironment , UNO_QUERY ) ;
- if( !xEnvTunnel.is() ) {
- throw RuntimeException() ;^1
- }
-
- SecurityEnvironment_NssImpl* pSecEnv = ( SecurityEnvironment_NssImpl* )xEnvTunnel->getSomething( SecurityEnvironment_NssImpl::getUnoTunnelId() ) ;
- if( pSecEnv == NULL )
- throw RuntimeException() ;
-
- //todo
-// slot = pSecEnv->getCryptoSlot() ;
- handler = pSecEnv->getCertDb() ;
-
- /*-
- * The following lines is based on the private version of xmlSec-NSS
- * crypto engine
- */
- m_pKeysMngr = xmlSecNssAppliedKeysMngrCreate( slot , handler ) ;
- if( m_pKeysMngr == NULL )
- throw RuntimeException() ;
-
- /*-
- * Adopt symmetric key into keys manager
- */
- for( i = 0 ; ( symKey = pSecEnv->getSymKey( i ) ) != NULL ; i ++ ) {
- if( xmlSecNssAppliedKeysMngrSymKeyLoad( m_pKeysMngr, symKey ) < 0 ) {
- throw RuntimeException() ;
- }
- }
-
- /*-
- * Adopt asymmetric public key into keys manager
- */
- for( i = 0 ; ( pubKey = pSecEnv->getPubKey( i ) ) != NULL ; i ++ ) {
- if( xmlSecNssAppliedKeysMngrPubKeyLoad( m_pKeysMngr, pubKey ) < 0 ) {
- throw RuntimeException() ;
- }
- }
-
- /*-
- * Adopt asymmetric private key into keys manager
- */
- for( i = 0 ; ( priKey = pSecEnv->getPriKey( i ) ) != NULL ; i ++ ) {
- if( xmlSecNssAppliedKeysMngrPriKeyLoad( m_pKeysMngr, priKey ) < 0 ) {
- throw RuntimeException() ;
- }
- }
-}
-
-/* XXMLSecurityContext */
-Reference< XSecurityEnvironment > SAL_CALL XMLSecurityContext_NssImpl :: getSecurityEnvironment()
- throw (RuntimeException)
-{
- return m_xSecurityEnvironment ;
-}
-#endif
+//i39448 : old methods deleted
/* XInitialization */
@@ -282,45 +199,5 @@ Reference< XSingleServiceFactory > XMLSecurityContext_NssImpl :: impl_createFact
return ::cppu::createSingleFactory( aServiceManager , impl_getImplementationName() , impl_createInstance , impl_getSupportedServiceNames() ) ;
}
-#if 0 //not useful any longer
-/* XUnoTunnel */
-sal_Int64 SAL_CALL XMLSecurityContext_NssImpl :: getSomething( const Sequence< sal_Int8 >& aIdentifier )
-throw (RuntimeException)
-{
- if( aIdentifier.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) {
- return ( sal_Int64 )this ;
- }
- return 0 ;
-}
-
-/* XUnoTunnel extension */
-const Sequence< sal_Int8>& XMLSecurityContext_NssImpl :: getUnoTunnelId() {
- static Sequence< sal_Int8 >* pSeq = 0 ;
- if( !pSeq ) {
- ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ;
- if( !pSeq ) {
- static Sequence< sal_Int8> aSeq( 16 ) ;
- rtl_createUuid( ( sal_uInt8* )aSeq.getArray() , 0 , sal_True ) ;
- pSeq = &aSeq ;
- }
- }
- return *pSeq ;
-}
-
-/* XUnoTunnel extension */
-XMLSecurityContext_NssImpl* XMLSecurityContext_NssImpl :: getImplementation( const Reference< XInterface > xObj ) {
- Reference< XUnoTunnel > xUT( xObj , UNO_QUERY ) ;
- if( xUT.is() ) {
- return ( XMLSecurityContext_NssImpl* )xUT->getSomething( getUnoTunnelId() ) ;
- } else
- return NULL ;
-}
-
-/* Native methods */
-xmlSecKeysMngrPtr XMLSecurityContext_NssImpl :: keysManager() throw( Exception, RuntimeException ) {
- return m_pKeysMngr ;
-}
-
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index 090dee7..51e8ab2 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -126,11 +126,7 @@ SAL_CALL XMLSignature_NssImpl :: generate(
throw RuntimeException() ;
}
-#if 0 //i39448 : the key manager should be retrieved from SecurityEnvironment, instead of SecurityContext
- XMLSecurityContext_NssImpl* pSecCtxt = ( XMLSecurityContext_NssImpl* )xSecTunnel->getSomething( XMLSecurityContext_NssImpl::getUnoTunnelId() ) ;
- if( pSecCtxt == NULL )
- throw RuntimeException() ;
-#endif
+ //i39448 : the key manager should be retrieved from SecurityEnvironment, instead of SecurityContext
SecurityEnvironment_NssImpl* pSecEnv =
reinterpret_cast<SecurityEnvironment_NssImpl*>(
--
1.7.1
--------------050307010909000709050806--
More information about the LibreOffice
mailing list