werner      2005/08/15 06:37:46

  Modified:    src/org/apache/ws/security/components/crypto Merlin.java
  Log:
  Add additional check for NULL pointer (JIRA WSS-16)
  
  Revision  Changes    Path
  1.26      +1 -1      
ws-wss4j/src/org/apache/ws/security/components/crypto/Merlin.java
  
  Index: Merlin.java
  ===================================================================
  RCS file: 
/home/cvs/ws-wss4j/src/org/apache/ws/security/components/crypto/Merlin.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- Merlin.java       30 Jul 2005 12:05:08 -0000      1.25
  +++ Merlin.java       15 Aug 2005 13:37:46 -0000      1.26
  @@ -560,7 +560,7 @@
                 */
                byte[] derEncodedValue = cert.getExtensionValue(SKI_OID);
   
  -             if (cert.getVersion() < 3) {
  +              if (cert.getVersion() < 3 || derEncodedValue == null) {
                        PublicKey key = cert.getPublicKey();
                        if (!(key instanceof RSAPublicKey)) {
                                throw new WSSecurityException(
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to