src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java

*** 72,82 ****
      public SignatureAlgorithm(Document doc, String algorithmURI) throws XMLSecurityException {
          super(doc, algorithmURI);
          this.algorithmURI = algorithmURI;
  
          signatureAlgorithm = getSignatureAlgorithmSpi(algorithmURI);
!         signatureAlgorithm.engineGetContextFromElement(this._constructionElement);
      }
  
      /**
       * Constructor SignatureAlgorithm
       *
--- 72,82 ----
      public SignatureAlgorithm(Document doc, String algorithmURI) throws XMLSecurityException {
          super(doc, algorithmURI);
          this.algorithmURI = algorithmURI;
          
          signatureAlgorithm = getSignatureAlgorithmSpi(algorithmURI);
!         signatureAlgorithm.engineGetContextFromElement(this.constructionElement);
      }
  
      /**
       * Constructor SignatureAlgorithm
       *
*** 90,103 ****
      ) throws XMLSecurityException {
          super(doc, algorithmURI);
          this.algorithmURI = algorithmURI;
  
          signatureAlgorithm = getSignatureAlgorithmSpi(algorithmURI);
!         signatureAlgorithm.engineGetContextFromElement(this._constructionElement);
  
          signatureAlgorithm.engineSetHMACOutputLength(hmacOutputLength);
!         ((IntegrityHmac)signatureAlgorithm).engineAddContextToElement(_constructionElement);
      }
  
      /**
       * Constructor SignatureAlgorithm
       *
--- 90,103 ----
      ) throws XMLSecurityException {
          super(doc, algorithmURI);
          this.algorithmURI = algorithmURI;
          
          signatureAlgorithm = getSignatureAlgorithmSpi(algorithmURI);
!         signatureAlgorithm.engineGetContextFromElement(this.constructionElement);
          
          signatureAlgorithm.engineSetHMACOutputLength(hmacOutputLength);
!         ((IntegrityHmac)signatureAlgorithm).engineAddContextToElement(constructionElement);
      }
  
      /**
       * Constructor SignatureAlgorithm
       *
*** 134,144 ****
  
              throw new XMLSecurityException("signature.signatureAlgorithm", exArgs);
          }
  
          signatureAlgorithm = getSignatureAlgorithmSpi(algorithmURI);
!         signatureAlgorithm.engineGetContextFromElement(this._constructionElement);
      }
  
      /**
       * Get a SignatureAlgorithmSpi object corresponding to the algorithmURI argument
       */
--- 134,144 ----
  
              throw new XMLSecurityException("signature.signatureAlgorithm", exArgs);
          }
          
          signatureAlgorithm = getSignatureAlgorithmSpi(algorithmURI);
!         signatureAlgorithm.engineGetContextFromElement(this.constructionElement);
      }
  
      /**
       * Get a SignatureAlgorithmSpi object corresponding to the algorithmURI argument
       */
*** 308,318 ****
       * Returns the URI representation of Transformation algorithm
       *
       * @return the URI representation of Transformation algorithm
       */
      public final String getURI() {
!         return _constructionElement.getAttributeNS(null, Constants._ATT_ALGORITHM);
      }
  
      /**
       * Registers implementing class of the Transform algorithm with algorithmURI
       *
--- 308,318 ----
       * Returns the URI representation of Transformation algorithm
       *
       * @return the URI representation of Transformation algorithm
       */
      public final String getURI() {
!         return constructionElement.getAttributeNS(null, Constants._ATT_ALGORITHM);
      }
  
      /**
       * Registers implementing class of the Transform algorithm with algorithmURI
       *
*** 378,390 ****
  
      /**
       * This method registers the default algorithms.
       */
      public static void registerDefaultAlgorithms() {
!         algorithmHash.put(
!             XMLSignature.ALGO_ID_SIGNATURE_DSA, SignatureDSA.class
!         );
          algorithmHash.put(
              XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1, SignatureBaseRSA.SignatureRSASHA1.class
          );
          algorithmHash.put(
              XMLSignature.ALGO_ID_MAC_HMAC_SHA1, IntegrityHmac.IntegrityHmacSHA1.class
--- 378,388 ----
      
      /**
       * This method registers the default algorithms.
       */
      public static void registerDefaultAlgorithms() {
!         algorithmHash.put(SignatureDSA.URI, SignatureDSA.class);
          algorithmHash.put(
              XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1, SignatureBaseRSA.SignatureRSASHA1.class
          );
          algorithmHash.put(
              XMLSignature.ALGO_ID_MAC_HMAC_SHA1, IntegrityHmac.IntegrityHmacSHA1.class
*** 408,417 ****
--- 406,424 ----
          );
          algorithmHash.put(
              XMLSignature.ALGO_ID_SIGNATURE_ECDSA_SHA1, SignatureECDSA.SignatureECDSASHA1.class
          );
          algorithmHash.put(
+             XMLSignature.ALGO_ID_SIGNATURE_ECDSA_SHA256, SignatureECDSA.SignatureECDSASHA256.class
+         );
+         algorithmHash.put(
+             XMLSignature.ALGO_ID_SIGNATURE_ECDSA_SHA384, SignatureECDSA.SignatureECDSASHA384.class
+         );
+         algorithmHash.put(
+             XMLSignature.ALGO_ID_SIGNATURE_ECDSA_SHA512, SignatureECDSA.SignatureECDSASHA512.class
+         );
+         algorithmHash.put(
              XMLSignature.ALGO_ID_MAC_HMAC_NOT_RECOMMENDED_MD5, IntegrityHmac.IntegrityHmacMD5.class
          );
          algorithmHash.put(
              XMLSignature.ALGO_ID_MAC_HMAC_RIPEMD160, IntegrityHmac.IntegrityHmacRIPEMD160.class
          );