Kaydet (Commit) bb07f8d3 authored tarafından Michael Mi's avatar Michael Mi

Issue number:

Submitted by: Andrew Fan
Reviewed by:
Change some symboles in enc/dec test routines.
üst 68055773
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: decrypter.cxx,v $ * $RCSfile: decrypter.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: mmi $ $Date: 2004-07-15 08:22:31 $ * last change: $Author: mmi $ $Date: 2004-08-06 03:21:15 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -170,7 +170,7 @@ int SAL_CALL main( int argc, char **argv ) ...@@ -170,7 +170,7 @@ int SAL_CALL main( int argc, char **argv )
//Create encryption template //Create encryption template
Reference< XInterface > tplElement = Reference< XInterface > tplElement =
xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.xsec.XMLElementWrapper" ) , xContext ) ; xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ;
OSL_ENSURE( tplElement.is() , OSL_ENSURE( tplElement.is() ,
"Decryptor - " "Decryptor - "
"Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ; "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
...@@ -194,7 +194,7 @@ int SAL_CALL main( int argc, char **argv ) ...@@ -194,7 +194,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Encryption template //Build XML Encryption template
Reference< XInterface > enctpl = Reference< XInterface > enctpl =
xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.xsec.XMLEncryptionTemplate"), xContext ) ; xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.crypto.XMLEncryptionTemplate"), xContext ) ;
OSL_ENSURE( enctpl.is() , OSL_ENSURE( enctpl.is() ,
"Decryptor - " "Decryptor - "
"Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ; "Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ;
...@@ -210,7 +210,7 @@ int SAL_CALL main( int argc, char **argv ) ...@@ -210,7 +210,7 @@ int SAL_CALL main( int argc, char **argv )
//Create security environment //Create security environment
//Build Security Environment //Build Security Environment
Reference< XInterface > xsecenv = Reference< XInterface > xsecenv =
xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.xsec.SecurityEnvironment"), xContext ) ; xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ;
OSL_ENSURE( xsecenv.is() , OSL_ENSURE( xsecenv.is() ,
"Decryptor - " "Decryptor - "
"Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ; "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
...@@ -237,7 +237,7 @@ int SAL_CALL main( int argc, char **argv ) ...@@ -237,7 +237,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Security Context //Build XML Security Context
Reference< XInterface > xmlsecctx = Reference< XInterface > xmlsecctx =
xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.xsec.XMLSecurityContext"), xContext ) ; xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"), xContext ) ;
OSL_ENSURE( xmlsecctx.is() , OSL_ENSURE( xmlsecctx.is() ,
"Decryptor - " "Decryptor - "
"Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ; "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
...@@ -252,7 +252,7 @@ int SAL_CALL main( int argc, char **argv ) ...@@ -252,7 +252,7 @@ int SAL_CALL main( int argc, char **argv )
//Get encrypter //Get encrypter
Reference< XInterface > xmlencrypter = Reference< XInterface > xmlencrypter =
xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.xsec.XMLEncryption"), xContext ) ; xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl"), xContext ) ;
OSL_ENSURE( xmlencrypter.is() , OSL_ENSURE( xmlencrypter.is() ,
"Decryptor - " "Decryptor - "
"Cannot get service instance of \"xsec.XMLEncryption\"" ) ; "Cannot get service instance of \"xsec.XMLEncryption\"" ) ;
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: encrypter.cxx,v $ * $RCSfile: encrypter.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: mmi $ $Date: 2004-07-15 08:22:31 $ * last change: $Author: mmi $ $Date: 2004-08-06 03:21:15 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -178,7 +178,7 @@ int SAL_CALL main( int argc, char **argv ) ...@@ -178,7 +178,7 @@ int SAL_CALL main( int argc, char **argv )
//Create encryption template //Create encryption template
Reference< XInterface > tplElement = Reference< XInterface > tplElement =
xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.xsec.XMLElementWrapper" ) , xContext ) ; xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ;
OSL_ENSURE( tplElement.is() , OSL_ENSURE( tplElement.is() ,
"Encryptor - " "Encryptor - "
"Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ; "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
...@@ -202,7 +202,7 @@ int SAL_CALL main( int argc, char **argv ) ...@@ -202,7 +202,7 @@ int SAL_CALL main( int argc, char **argv )
//Create encryption target element //Create encryption target element
Reference< XInterface > tarElement = Reference< XInterface > tarElement =
xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.xsec.XMLElementWrapper" ) , xContext ) ; xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ;
OSL_ENSURE( tarElement.is() , OSL_ENSURE( tarElement.is() ,
"Encryptor - " "Encryptor - "
"Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ; "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ;
...@@ -227,7 +227,7 @@ int SAL_CALL main( int argc, char **argv ) ...@@ -227,7 +227,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Encryption template //Build XML Encryption template
Reference< XInterface > enctpl = Reference< XInterface > enctpl =
xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.xsec.XMLEncryptionTemplate"), xContext ) ; xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.crypto.XMLEncryptionTemplate"), xContext ) ;
OSL_ENSURE( enctpl.is() , OSL_ENSURE( enctpl.is() ,
"Encryptor - " "Encryptor - "
"Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ; "Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ;
...@@ -244,7 +244,7 @@ int SAL_CALL main( int argc, char **argv ) ...@@ -244,7 +244,7 @@ int SAL_CALL main( int argc, char **argv )
//Create security environment //Create security environment
//Build Security Environment //Build Security Environment
Reference< XInterface > xsecenv = Reference< XInterface > xsecenv =
xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.xsec.SecurityEnvironment"), xContext ) ; xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ;
OSL_ENSURE( xsecenv.is() , OSL_ENSURE( xsecenv.is() ,
"Encryptor - " "Encryptor - "
"Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ; "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ;
...@@ -272,7 +272,7 @@ int SAL_CALL main( int argc, char **argv ) ...@@ -272,7 +272,7 @@ int SAL_CALL main( int argc, char **argv )
//Build XML Security Context //Build XML Security Context
Reference< XInterface > xmlsecctx = Reference< XInterface > xmlsecctx =
xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.xsec.XMLSecurityContext"), xContext ) ; xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"), xContext ) ;
OSL_ENSURE( xmlsecctx.is() , OSL_ENSURE( xmlsecctx.is() ,
"Encryptor - " "Encryptor - "
"Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ; "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ;
...@@ -286,7 +286,7 @@ int SAL_CALL main( int argc, char **argv ) ...@@ -286,7 +286,7 @@ int SAL_CALL main( int argc, char **argv )
//Get encrypter //Get encrypter
Reference< XInterface > xmlencrypter = Reference< XInterface > xmlencrypter =
xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.xsec.XMLEncryption"), xContext ) ; xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl"), xContext ) ;
OSL_ENSURE( xmlencrypter.is() , OSL_ENSURE( xmlencrypter.is() ,
"Encryptor - " "Encryptor - "
"Cannot get service instance of \"xsec.XMLEncryption\"" ) ; "Cannot get service instance of \"xsec.XMLEncryption\"" ) ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment