[cpp-sp COMMIT] in /branches/REL_2: schemas/shibboleth-2.0-native-sp-config.xsd shibsp/attribute/resolver/impl/QueryA...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Jul 20 16:12:06 2012
New Revision: 3731

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3731&view=rev
Log:
Rename authenticatedCipher option.

Modified:
    branches/REL_2/schemas/shibboleth-2.0-native-sp-config.xsd
    branches/REL_2/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp
    branches/REL_2/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
    branches/REL_2/shibsp/handler/impl/SAML2Consumer.cpp

Modified: branches/REL_2/schemas/shibboleth-2.0-native-sp-config.xsd
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/schemas/shibboleth-2.0-native-sp-config.xsd?rev=3731&r1=3730&r2=3731&view=diff
==============================================================================
--- branches/REL_2/schemas/shibboleth-2.0-native-sp-config.xsd (original)
+++ branches/REL_2/schemas/shibboleth-2.0-native-sp-config.xsd Fri Jul 20 16:12:06 2012
@@ -444,7 +444,7 @@
     <attribute name="unsetHeaders" type="conf:listOfStrings"/>
     <attribute name="metadataAttributePrefix" type="conf:string"/>
     <attribute name="attributePrefix" type="conf:string"/>
-    <attribute name="requireAuthenticatedCipher" type="boolean"/>
+    <attribute name="requireAuthenticatedEncryption" type="boolean"/>
   </attributeGroup>
 
   <attributeGroup name="RelyingPartyGroup">

Modified: branches/REL_2/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp?rev=3731&r1=3730&r2=3731&view=diff
==============================================================================
--- branches/REL_2/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp (original)
+++ branches/REL_2/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp Fri Jul 20 16:12:06 2012
@@ -561,7 +561,7 @@
 
         // With this flag on, we block unauthenticated ciphertext when decrypting,
         // unless the protocol was authenticated.
-        pair<bool,bool> authenticatedCipher = application.getBool("requireAuthenticatedCipher");
+        pair<bool,bool> authenticatedCipher = application.getBool("requireAuthenticatedEncryption");
         if (policy->isAuthenticated())
             authenticatedCipher.second = false;
 

Modified: branches/REL_2/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp?rev=3731&r1=3730&r2=3731&view=diff
==============================================================================
--- branches/REL_2/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp (original)
+++ branches/REL_2/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp Fri Jul 20 16:12:06 2012
@@ -465,7 +465,7 @@
 
         // With this flag on, we block unauthenticated ciphertext when decrypting,
         // unless the protocol was authenticated.
-        pair<bool,bool> authenticatedCipher = application.getBool("requireAuthenticatedCipher");
+        pair<bool,bool> authenticatedCipher = application.getBool("requireAuthenticatedEncryption");
         if (policy->isAuthenticated())
             authenticatedCipher.second = false;
 

Modified: branches/REL_2/shibsp/handler/impl/SAML2Consumer.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/handler/impl/SAML2Consumer.cpp?rev=3731&r1=3730&r2=3731&view=diff
==============================================================================
--- branches/REL_2/shibsp/handler/impl/SAML2Consumer.cpp (original)
+++ branches/REL_2/shibsp/handler/impl/SAML2Consumer.cpp Fri Jul 20 16:12:06 2012
@@ -170,9 +170,9 @@
 
     // With this flag on, we block unauthenticated ciphertext when decrypting,
     // unless the protocol was authenticated.
-    pair<bool,bool> requireAuthenticatedCipher = application.getBool("requireAuthenticatedCipher");
+    pair<bool,bool> requireAuthenticatedEncryption = application.getBool("requireAuthenticatedEncryption");
     if (alreadySecured)
-        requireAuthenticatedCipher.second = false;
+        requireAuthenticatedEncryption.second = false;
 
     // With this flag on, we ignore any unsigned assertions.
     const EntityDescriptor* entity = nullptr;
@@ -291,7 +291,7 @@
                     *cr,
                     application.getRelyingParty(entity)->getXMLString("entityID").second,
                     mcc.get(),
-                    requireAuthenticatedCipher.first && requireAuthenticatedCipher.second
+                    requireAuthenticatedEncryption.first && requireAuthenticatedEncryption.second
                     )
                 );
             decrypted = dynamic_pointer_cast<saml2::Assertion>(wrapper);