SecurityLevel2 related updates

5 files changed, 95 insertions, 10 deletions

diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.bor b/TAO/orbsvcs/orbsvcs/SSLIOP.bor
index 67523ed7d98..baa666ea1ba 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP.bor
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP.bor
@@ -23,15 +23,20 @@ OBJFILES = \
 	$(OBJDIR)\SSLIOP_Acceptor.obj \
 	$(OBJDIR)\SSLIOP_Connection_Handler.obj \
 	$(OBJDIR)\SSLIOP_Connector.obj \
+	$(OBJDIR)\SSLIOP_Credentials.obj \
 	$(OBJDIR)\SSLIOP_Current.obj \
 	$(OBJDIR)\SSLIOP_Current_Impl.obj \
         $(OBJDIR)\SSLIOP_Endpoint.obj \
 	$(OBJDIR)\SSLIOP_Factory.obj \
 	$(OBJDIR)\SSLIOP_Invocation_Interceptor.obj \
 	$(OBJDIR)\SSLIOP_ORBInitializer.obj \
+	$(OBJDIR)\SSLIOP_PrincipalAuthenticator.obj \
 	$(OBJDIR)\SSLIOP_Profile.obj \
+	$(OBJDIR)\SSLIOP_ReceivedCredentials.obj \
+	$(OBJDIR)\SSLIOP_TargetCredentials.obj \
 	$(OBJDIR)\SSLIOP_Transport.obj \
 	$(OBJDIR)\SSLIOP_Util.obj \
+	$(OBJDIR)\SSLIOP_X509.obj \
         $(OBJDIR)\SSLIOPC.obj
 
 RESOURCE = $(OBJDIR)\orbsvcs.res
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.dsp b/TAO/orbsvcs/orbsvcs/SSLIOP.dsp
index 498298145aa..5f7ddc0a44a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP.dsp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP.dsp
@@ -127,6 +127,10 @@ SOURCE=.\SSLIOP\SSLIOP_Connector.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\SSLIOP\SSLIOP_Credentials.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\SSLIOP\SSLIOP_Current.cpp

 # End Source File

 # Begin Source File

@@ -151,10 +155,22 @@ SOURCE=.\SSLIOP\SSLIOP_ORBInitializer.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\SSLIOP\SSLIOP_PrincipalAuthenticator.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\SSLIOP\SSLIOP_Profile.cpp

 # End Source File

 # Begin Source File

 

+SOURCE=.\SSLIOP\SSLIOP_ReceivedCredentials.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\SSLIOP\SSLIOP_TargetCredentials.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\SSLIOP\SSLIOP_Transport.cpp

 # End Source File

 # Begin Source File

@@ -163,6 +179,10 @@ SOURCE=.\SSLIOP\SSLIOP_Util.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\SSLIOP\SSLIOP_X509.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\SSLIOPC.cpp

 # End Source File

 # End Group

@@ -203,6 +223,10 @@ SOURCE=.\SSLIOP\SSLIOP_Connector.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\SSLIOP\SSLIOP_Credentials.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\SSLIOP\SSLIOP_Current.h

 # End Source File

 # Begin Source File

@@ -231,10 +255,22 @@ SOURCE=.\SSLIOP\SSLIOP_ORBInitializer.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\SSLIOP\SSLIOP_PrincipalAuthenticator.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\SSLIOP\SSLIOP_Profile.h

 # End Source File

 # Begin Source File

 

+SOURCE=.\SSLIOP\SSLIOP_ReceivedCredentials.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\SSLIOP\SSLIOP_TargetCredentials.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\SSLIOP\SSLIOP_Transport.h

 # End Source File

 # Begin Source File

@@ -243,6 +279,10 @@ SOURCE=.\SSLIOP\SSLIOP_Util.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\SSLIOP\SSLIOP_X509.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\SSLIOPC.h

 # End Source File

 # End Group

@@ -372,6 +412,10 @@ SOURCE=.\SSLIOP\SSLIOP_Profile.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\SSLIOP\SSLIOP_X509.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\SSLIOPC.i

 # End Source File

 # End Group

diff --git a/TAO/orbsvcs/orbsvcs/Security.bor b/TAO/orbsvcs/orbsvcs/Security.bor
index 5a53c88f352..c737adbafcd 100644
--- a/TAO/orbsvcs/orbsvcs/Security.bor
+++ b/TAO/orbsvcs/orbsvcs/Security.bor
@@ -24,7 +24,11 @@ OBJFILES = \
 	$(OBJDIR)\Security_Current_Impl.obj \
         $(OBJDIR)\Security_ORBInitializer.obj \
         $(OBJDIR)\Security_PolicyFactory.obj \
+	$(OBJDIR)\SecurityManager.obj \
+	$(OBJDIR)\PrincipalAuthenticator.obj \
 	$(OBJDIR)\EstablishTrustPolicy.obj \
+	$(OBJDIR)\InvocationCredentialsPolicy.obj \
+	$(OBJDIR)\MechanismPolicy.obj \
         $(OBJDIR)\QOPPolicy.obj
 
 RESOURCE = $(OBJDIR)\orbsvcs.res
diff --git a/TAO/orbsvcs/orbsvcs/Security.dsp b/TAO/orbsvcs/orbsvcs/Security.dsp
index e6c6b7d18f3..9bcba5417d2 100644
--- a/TAO/orbsvcs/orbsvcs/Security.dsp
+++ b/TAO/orbsvcs/orbsvcs/Security.dsp
@@ -99,6 +99,18 @@ SOURCE=.\Security\EstablishTrustPolicy.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Security\InvocationCredentialsPolicy.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Security\MechanismPolicy.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Security\PrincipalAuthenticator.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Security\QOPPolicy.cpp

 # End Source File

 # Begin Source File

@@ -133,6 +145,10 @@ SOURCE=.\SecurityLevel2C.cpp
 

 SOURCE=.\SecurityLevel2S.cpp

 # End Source File

+# Begin Source File

+

+SOURCE=.\Security\SecurityManager.cpp

+# End Source File

 # End Group

 # Begin Group "Header Files"

 

@@ -143,6 +159,22 @@ SOURCE=.\Security\EstablishTrustPolicy.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Security\InvocationCredentialsPolicy.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Security\MechanismPolicy.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Security\PrincipalAuthenticator.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Security\PrincipalAuthenticator_Impl.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Security\QOPPolicy.h

 # End Source File

 # Begin Source File

@@ -189,6 +221,10 @@ SOURCE=.\SecurityLevel2S.h
 

 SOURCE=.\SecurityLevel2S_T.h

 # End Source File

+# Begin Source File

+

+SOURCE=.\Security\SecurityManager.h

+# End Source File

 # End Group

 # Begin Group "IDL Files"

 

diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl
index 62d8b233edc..6e3afcecb33 100644
--- a/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl
+++ b/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl
@@ -76,28 +76,24 @@ module SecurityLevel2 {
     attribute Security::AssociationOptions
       invocation_options_required;
 
-    boolean get_security_feature(
+    boolean get_security_feature (
       in Security::CommunicationDirection direction,
       in Security::SecurityFeature feature
     );
 
-
     boolean set_attributes (
       in Security::AttributeList   requested_attributes,
       out Security::AttributeList  actual_attributes
     );
 
     Security::AttributeList get_attributes (
-      in   Security::AttributeTypeList        attributes
+      in Security::AttributeTypeList attributes
     );
 
-    boolean is_valid (
-      out  Security::UtcT                     expiry_time
-    );
+    boolean is_valid (out Security::UtcT expiry_time);
+
+    boolean refresh (in any refresh_data);
 
-    boolean refresh (
-      in any                                    refresh_data
-    );
   };
 
   typedef sequence <Credentials>  CredentialsList;
@@ -129,7 +125,7 @@ module SecurityLevel2 {
   };
 
   // RequiredRights Interface
-  interface RequiredRights{
+  interface RequiredRights {
 
     void get_required_rights(
       in   Object                             obj,