incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zhan...@apache.org
Subject svn commit: r1380438 - in /incubator/ooo/trunk/main/xmlsecurity/source/xmlsec/mscrypt: securityenvironment_mscryptimpl.cxx securityenvironment_mscryptimpl.hxx
Date Tue, 04 Sep 2012 02:46:03 GMT
Author: zhangjf
Date: Tue Sep  4 02:46:03 2012
New Revision: 1380438

URL: http://svn.apache.org/viewvc?rev=1380438&view=rev
Log:
#i120675#, the certificate store handles need to be closed after closing the document 

Found by: zhangjf 
Patch by: zhangjf

Modified:
    incubator/ooo/trunk/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
    incubator/ooo/trunk/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx

Modified: incubator/ooo/trunk/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx?rev=1380438&r1=1380437&r2=1380438&view=diff
==============================================================================
--- incubator/ooo/trunk/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
(original)
+++ incubator/ooo/trunk/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
Tue Sep  4 02:46:03 2012
@@ -122,7 +122,7 @@ void traceTrustStatus(DWORD err)
     }
 }
 
-SecurityEnvironment_MSCryptImpl :: SecurityEnvironment_MSCryptImpl( const Reference< XMultiServiceFactory
>& aFactory ) : m_hProv( NULL ) , m_pszContainer( NULL ) , m_hKeyStore( NULL ), m_hCertStore(
NULL ), m_tSymKeyList() , m_tPubKeyList() , m_tPriKeyList(), m_xServiceManager( aFactory ),
m_bEnableDefault( sal_False ) {
+SecurityEnvironment_MSCryptImpl :: SecurityEnvironment_MSCryptImpl( const Reference< XMultiServiceFactory
>& aFactory ) : m_hProv( NULL ) , m_pszContainer( NULL ) , m_hKeyStore( NULL ), m_hCertStore(
NULL ), m_tSymKeyList() , m_tPubKeyList() , m_tPriKeyList(), m_xServiceManager( aFactory ),
m_bEnableDefault( sal_False ), m_hMySystemStore(NULL), m_hRootSystemStore(NULL), m_hTrustSystemStore(NULL),
m_hCaSystemStore(NULL){
 
 }
 
@@ -148,6 +148,27 @@ SecurityEnvironment_MSCryptImpl :: ~Secu
 		m_hKeyStore = NULL ;
 	}
 
+	//i120675, close the store handles 
+	if( m_hMySystemStore != NULL ) {
+		CertCloseStore( m_hMySystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+		m_hMySystemStore = NULL ;
+	}
+
+	if( m_hRootSystemStore != NULL ) {
+		CertCloseStore( m_hRootSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+		m_hRootSystemStore = NULL ;
+	}
+
+	if( m_hTrustSystemStore != NULL ) {
+		CertCloseStore( m_hTrustSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+		m_hTrustSystemStore = NULL ;
+	}
+
+	if( m_hCaSystemStore != NULL ) {
+		CertCloseStore( m_hCaSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+		m_hCaSystemStore = NULL ;
+	}
+
 	if( !m_tSymKeyList.empty()  ) {
 		std::list< HCRYPTKEY >::iterator symKeyIt ;
 
@@ -1260,40 +1281,42 @@ xmlSecKeysMngrPtr SecurityEnvironment_MS
 	 * Adopt system default certificate store.
 	 */
 	if( defaultEnabled() ) {
-		HCERTSTORE hSystemStore ;
-
 		//Add system key store into the keys manager.
-		hSystemStore = CertOpenSystemStore( 0, "MY" ) ;
-		if( hSystemStore != NULL ) {
-			if( xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore( pKeysMngr, hSystemStore ) < 0 ) {
-				CertCloseStore( hSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+		m_hMySystemStore = CertOpenSystemStore( 0, "MY" ) ;
+		if( m_hMySystemStore != NULL ) {
+			if( xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore( pKeysMngr, m_hMySystemStore ) < 0 )
{
+				CertCloseStore( m_hMySystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+				m_hMySystemStore = NULL;
 				throw RuntimeException() ;
 			}
 		}
 
 		//Add system root store into the keys manager.
-		hSystemStore = CertOpenSystemStore( 0, "Root" ) ;
-		if( hSystemStore != NULL ) {
-			if( xmlSecMSCryptoAppliedKeysMngrAdoptTrustedStore( pKeysMngr, hSystemStore ) < 0 )
{
-				CertCloseStore( hSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+		m_hRootSystemStore = CertOpenSystemStore( 0, "Root" ) ;
+		if( m_hRootSystemStore != NULL ) {
+			if( xmlSecMSCryptoAppliedKeysMngrAdoptTrustedStore( pKeysMngr, m_hRootSystemStore ) <
0 ) {
+				CertCloseStore( m_hRootSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+				m_hRootSystemStore = NULL;
 				throw RuntimeException() ;
 			}
 		}
 
 		//Add system trusted store into the keys manager.
-		hSystemStore = CertOpenSystemStore( 0, "Trust" ) ;
-		if( hSystemStore != NULL ) {
-			if( xmlSecMSCryptoAppliedKeysMngrAdoptUntrustedStore( pKeysMngr, hSystemStore ) < 0
) {
-				CertCloseStore( hSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+		m_hTrustSystemStore = CertOpenSystemStore( 0, "Trust" ) ;
+		if( m_hTrustSystemStore != NULL ) {
+			if( xmlSecMSCryptoAppliedKeysMngrAdoptUntrustedStore( pKeysMngr, m_hTrustSystemStore )
< 0 ) {
+				CertCloseStore( m_hTrustSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+				m_hTrustSystemStore = NULL;
 				throw RuntimeException() ;
 			}
 		}
 
 		//Add system CA store into the keys manager.
-		hSystemStore = CertOpenSystemStore( 0, "CA" ) ;
-		if( hSystemStore != NULL ) {
-			if( xmlSecMSCryptoAppliedKeysMngrAdoptUntrustedStore( pKeysMngr, hSystemStore ) < 0
) {
-				CertCloseStore( hSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+		m_hCaSystemStore = CertOpenSystemStore( 0, "CA" ) ;
+		if( m_hCaSystemStore != NULL ) {
+			if( xmlSecMSCryptoAppliedKeysMngrAdoptUntrustedStore( pKeysMngr, m_hCaSystemStore ) <
0 ) {
+				CertCloseStore( m_hCaSystemStore, CERT_CLOSE_STORE_CHECK_FLAG ) ;
+				m_hCaSystemStore = NULL;
 				throw RuntimeException() ;
 			}
 		}

Modified: incubator/ooo/trunk/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx?rev=1380438&r1=1380437&r2=1380438&view=diff
==============================================================================
--- incubator/ooo/trunk/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
(original)
+++ incubator/ooo/trunk/main/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
Tue Sep  4 02:46:03 2012
@@ -75,7 +75,13 @@ class SecurityEnvironment_MSCryptImpl : 
 
 		//Certiticate store
 		HCERTSTORE							m_hCertStore ;
-
+		
+		// i120675, save the store handles
+		HCERTSTORE 							m_hMySystemStore;
+		HCERTSTORE 							m_hRootSystemStore;
+		HCERTSTORE 							m_hTrustSystemStore;
+		HCERTSTORE 							m_hCaSystemStore;
+		
 		//Enable default system cryptography setting
 		sal_Bool							m_bEnableDefault ;
 



Mime
View raw message