Author: shankar
Date: Mon May 4 07:47:17 2009
New Revision: 771224
URL: http://svn.apache.org/viewvc?rev=771224&view=rev
Log:
Changing keys to get work with .NET OPSSEC
Added:
incubator/stonehenge/trunk/stocktrader/php/resources/keys/OPS.cert
incubator/stonehenge/trunk/stocktrader/php/resources/keys/OPS.pem
Removed:
incubator/stonehenge/trunk/stocktrader/php/resources/keys/alice_cert.cert
incubator/stonehenge/trunk/stocktrader/php/resources/keys/alice_key.pem
incubator/stonehenge/trunk/stocktrader/php/resources/keys/bob_cert.cert
incubator/stonehenge/trunk/stocktrader/php/resources/keys/bob_key.pem
Modified:
incubator/stonehenge/trunk/stocktrader/php/business_service/order_processor_proxy.php
incubator/stonehenge/trunk/stocktrader/php/order_processor/order_processor_svc_msec.php
incubator/stonehenge/trunk/stocktrader/php/resources/conf/policy.xml
Modified:
incubator/stonehenge/trunk/stocktrader/php/business_service/order_processor_proxy.php
URL:
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/php/business_service/order_processor_proxy.php?rev=771224&r1=771223&r2=771224&view=diff
==============================================================================
---
incubator/stonehenge/trunk/stocktrader/php/business_service/order_processor_proxy.php
(original)
+++
incubator/stonehenge/trunk/stocktrader/php/business_service/order_processor_proxy.php
Mon May 4 07:47:17 2009
@@ -108,14 +108,10 @@
if ($OPSConfig->Sec)
{
//This is the security information
- $rec_cert =
ws_get_key_from_file("../resources/keys/bob_cert.cert");
- $pvt_key =
ws_get_key_from_file("../resources/keys/alice_key.pem");
- $my_cert =
ws_get_key_from_file("../resources/keys/alice_cert.cert");
+ $rec_cert =
ws_get_key_from_file("../resources/keys/OPS.cert");
$policy_xml =
file_get_contents("../resources/conf/policy.xml");
$policy = new WSPolicy($policy_xml);
- $sec_token = new
WSSecurityToken(array("receiverCertificate" => $rec_cert,
- "privateKey" => $pvt_key,
- "certificate" => $my_cert));
+ $sec_token = new
WSSecurityToken(array("receiverCertificate" => $rec_cert));
$client = new WSClient(array (
"wsdl" =>
"../resources/wsdl/TradeOrders.wsdl",
"classmap" => $class_map,
Modified:
incubator/stonehenge/trunk/stocktrader/php/order_processor/order_processor_svc_msec.php
URL:
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/php/order_processor/order_processor_svc_msec.php?rev=771224&r1=771223&r2=771224&view=diff
==============================================================================
---
incubator/stonehenge/trunk/stocktrader/php/order_processor/order_processor_svc_msec.php
(original)
+++
incubator/stonehenge/trunk/stocktrader/php/order_processor/order_processor_svc_msec.php
Mon May 4 07:47:17 2009
@@ -90,7 +90,7 @@
"isOnline" => "isOnline");
//This is the security information
-$pvt_key = ws_get_key_from_file("../resources/keys/bob_key.pem");
+$pvt_key = ws_get_key_from_file("../resources/keys/OPS.pem");
$policy_xml = file_get_contents("../resources/conf/policy.xml");
$policy = new WSPolicy($policy_xml);
$sec_token = new WSSecurityToken(array("privateKey" => $pvt_key));
Modified: incubator/stonehenge/trunk/stocktrader/php/resources/conf/policy.xml
URL:
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/php/resources/conf/policy.xml?rev=771224&r1=771223&r2=771224&view=diff
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/php/resources/conf/policy.xml
(original)
+++ incubator/stonehenge/trunk/stocktrader/php/resources/conf/policy.xml Mon
May 4 07:47:17 2009
@@ -23,9 +23,10 @@
<wsp:Policy>
<sp:ProtectionToken>
<wsp:Policy>
- <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
<wsp:Policy>
<sp:WssX509V3Token10/>
+
<sp:RequireThumbprintReference/>
</wsp:Policy>
</sp:X509Token>
</wsp:Policy>
@@ -52,6 +53,7 @@
</sp:Wss10>
<sp:SignedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<sp:Body/>
+ <sp:Header
Namespace="http://www.w3.org/2005/08/addressing"/>
</sp:SignedParts>
<sp:EncryptedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
<sp:Body/>
Added: incubator/stonehenge/trunk/stocktrader/php/resources/keys/OPS.cert
URL:
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/php/resources/keys/OPS.cert?rev=771224&view=auto
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/php/resources/keys/OPS.cert (added)
+++ incubator/stonehenge/trunk/stocktrader/php/resources/keys/OPS.cert Mon May
4 07:47:17 2009
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB8DCCAVmgAwIBAgIQ1ELWkagtIaZA+rGlQ0DB/DANBgkqhkiG9w0BAQQFADAS
+MRAwDgYDVQQDEwdPUFMuQ29tMB4XDTA4MDUyMTA0NDUwMVoXDTM5MTIzMTIzNTk1
+OVowEjEQMA4GA1UEAxMHT1BTLkNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
+gYEAxwk9moHNb3pwAFdolsVrNRCypa9MAH9NOblGJRW6av93sC5oubfjbzfIgURy
+cVgOYoI/6G3AZijENC//tR8CiNuwfc338j4gGJCYQMKF80f0v+wsOChbWA/jSMmW
+0XeZ2mtn28kUzZwBN+auK+iUurYmUfZlNCIzLrM49KKqLRMCAwEAAaNHMEUwQwYD
+VR0BBDwwOoAQGGhusN6c4j/7WSnvieRMbKEUMBIxEDAOBgNVBAMTB09QUy5Db22C
+ENRC1pGoLSGmQPqxpUNAwfwwDQYJKoZIhvcNAQEEBQADgYEAZ8xVxioCvG8t8iCx
+5Xy7JgUyGVnTgxVhP3+uMGSca0u1wqnfoPethXkykPkCP5ZEYSS5SoBLdCKhn1Hq
+ICdTBkR2m0ebo50CoXT1lAy+5MELdzlR8SH9KV6nokwCPAW3RURk1huaDi3FO1oF
+DVm6146rAByZrG/PjDe3w+MUaHg=
+-----END CERTIFICATE-----
Added: incubator/stonehenge/trunk/stocktrader/php/resources/keys/OPS.pem
URL:
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/php/resources/keys/OPS.pem?rev=771224&view=auto
==============================================================================
--- incubator/stonehenge/trunk/stocktrader/php/resources/keys/OPS.pem (added)
+++ incubator/stonehenge/trunk/stocktrader/php/resources/keys/OPS.pem Mon May
4 07:47:17 2009
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDHCT2agc1venAAV2iWxWs1ELKlr0wAf005uUYlFbpq/3ewLmi5
+t+NvN8iBRHJxWA5igj/obcBmKMQ0L/+1HwKI27B9zffyPiAYkJhAwoXzR/S/7Cw4
+KFtYD+NIyZbRd5naa2fbyRTNnAE35q4r6JS6tiZR9mU0IjMuszj0oqotEwIDAQAB
+AoGAdOQnastatGLKzliHUyzERpj04jtuPkiFOSZnXLZDEj3QtAa9eHzXtGSle82Q
+DKLzZ8Uo9T8npJfCiwe5fEym9mIffN9bKri7TTnbXCLUzMroT9NzgYt9cm+K38xc
+3dtvnBvR4nJh9yfhVrUytw5X+2Hts1GFjKM1qMNENGcZIVECQQDnV/vi5CXTJH8X
+VfsX5g8dTqETJpDbMR7sSvOndODZeZ+HpqdIc15zUtI2T+CiTJML19kTb8tS+7NP
+iu7ibMc7AkEA3D/FgmLqJJzHkNce2u0nmwcaqmogma5Usfuj3ogPz15gLiz0Hdfu
+VPSQYusZbf8IbMgrI3u5RW8gZOP5FArECQJATbkPlSDVXGSMlkh6vYK7XTtHfmmc
+jSepnfVoesAXsrjb0fU5imvINbKDkV+wtpZHaNkxwwfyJYUOrxCcRVIKdQJBAJnk
+dT0FoFS0tzydExIlYucPr7IjNWQsS0GRco6qw2FBsDKTdn7jwcPanoh/fOU+rcRU
+mM/SQ0Igw6G7KO64FwECQEmE0nHytro1ndme38/XxFbw1yRSpUUzOW+k9/JY0rLa
+gObJjr1kiy/BzSdCoz5ffXCmSD/ciAN7W3r58+97voc=
+-----END RSA PRIVATE KEY-----
