You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/03/06 18:37:47 UTC
svn commit: r1453452 - in
/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j:
policyhandlers/AbstractBindingBuilder.java
policyvalidators/X509TokenPolicyValidator.java
Author: coheigea
Date: Wed Mar 6 17:37:46 2013
New Revision: 1453452
URL: http://svn.apache.org/r1453452
Log:
Merged revisions 1453449 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1453449 | coheigea | 2013-03-06 17:35:47 +0000 (Wed, 06 Mar 2013) | 18 lines
Merged revisions 1453446 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1453446 | coheigea | 2013-03-06 17:34:06 +0000 (Wed, 06 Mar 2013) | 10 lines
Merged revisions 1453445 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1453445 | coheigea | 2013-03-06 17:32:59 +0000 (Wed, 06 Mar 2013) | 2 lines
[CXF-4880] - Incorrect enforcement of X509Token PKI policies
........
........
........
Modified:
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java
Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=1453452&r1=1453451&r2=1453452&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java Wed Mar 6 17:37:46 2013
@@ -420,7 +420,7 @@ public abstract class AbstractBindingBui
}
} else if (SPConstants.Layout.LaxTimestampFirst == layout.getValue()) {
if (timestamp == null) {
- ai.setNotAsserted(SPConstants.Layout.LaxTimestampLast + " requires a timestamp");
+ ai.setNotAsserted(SPConstants.Layout.LaxTimestampFirst + " requires a timestamp");
} else {
addTopDownElement(timestampEl.getElement());
}
Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java?rev=1453452&r1=1453451&r2=1453452&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java Wed Mar 6 17:37:46 2013
@@ -94,8 +94,8 @@ public class X509TokenPolicyValidator ex
}
String requiredType = X509_V3_VALUETYPE;
- if (SPConstants.WSS_X509_PKI_PATH_V1_TOKEN10.equals(requiredType)
- || SPConstants.WSS_X509_PKI_PATH_V1_TOKEN11.equals(requiredType)) {
+ if (SPConstants.WSS_X509_PKI_PATH_V1_TOKEN10.equals(requiredVersionAndType)
+ || SPConstants.WSS_X509_PKI_PATH_V1_TOKEN11.equals(requiredVersionAndType)) {
requiredType = PKI_VALUETYPE;
}