[Libreoffice-commits] core.git: xmlsecurity/source

[Tor Lillqvist]

 xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 9499df9f8c73ac6370c389683ce2028e6432441e
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Aug 12 09:28:57 2013 +0300

    Ifdef out code which had been accidentally un-commented-out
    
    The code snippet had been commented out since its introduction in
    2004. In 1452e5659796db395efa222d50cc8158275c5442 it was accidentally
    un-commented-out, but it causes compilation errors. So ifdef it out
    instead, with a comment. Note that I have no idea what the code does
    and whether it actually is useful to keep for future reference or not.
    
    Change-Id: Ie60ca065b2c65f86a7b382e246c1b650424daa1d

diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
index 0cfe3e6..72cc571 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx
@@ -280,6 +280,9 @@ XMLEncryption_MSCryptImpl :: decrypt(
         return aTemplate;
     }
     aTemplate->setStatus(::com::sun::star::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED);
+#if 0 // This code block has been commented out since 2004,
+      // but let's keep it here in case it contains some useful hints
+      // for future work.
     if( pEncCtx->resultReplaced != 0 ) {
         pContent = pEncryptedData ;
 
@@ -299,6 +302,7 @@ XMLEncryption_MSCryptImpl :: decrypt(
         xmlSecEncCtxDestroy( pEncCtx ) ;
         throw RuntimeException() ;
     }
+#endif // 0
 
     //Destroy the encryption context
     xmlSecEncCtxDestroy( pEncCtx ) ;