You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by ra...@apache.org on 2005/04/02 20:36:40 UTC

cvs commit: xml-security/src/org/apache/xml/security/algorithms SignatureAlgorithm.java SignatureAlgorithmSpi.java

raul        2005/04/02 10:36:40

  Modified:    src/org/apache/xml/security/algorithms
                        SignatureAlgorithm.java SignatureAlgorithmSpi.java
  Log:
  Fixed eclipse javadocs warning, and removed engineAddContextToElement
  
  Revision  Changes    Path
  1.21      +8 -6      xml-security/src/org/apache/xml/security/algorithms/SignatureAlgorithm.java
  
  Index: SignatureAlgorithm.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/algorithms/SignatureAlgorithm.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- SignatureAlgorithm.java	23 Mar 2005 18:14:54 -0000	1.20
  +++ SignatureAlgorithm.java	2 Apr 2005 18:36:40 -0000	1.21
  @@ -22,6 +22,7 @@
   import java.security.spec.AlgorithmParameterSpec;
   import java.util.HashMap;
   
  +import org.apache.xml.security.algorithms.implementations.IntegrityHmac;
   import org.apache.xml.security.exceptions.AlgorithmAlreadyRegisteredException;
   import org.apache.xml.security.exceptions.XMLSecurityException;
   import org.apache.xml.security.signature.XMLSignatureException;
  @@ -104,7 +105,7 @@
         this(doc, algorithmURI);
   
         this._signatureAlgorithm.engineSetHMACOutputLength(HMACOutputLength);
  -      this._signatureAlgorithm
  +      ((IntegrityHmac)this._signatureAlgorithm)
            .engineAddContextToElement(this._constructionElement);
      }
   
  @@ -176,7 +177,7 @@
      /**
       * Method getJCEProviderName
       *
  -    * @return
  +    * @return The Provider of this Signature Alogrithm
       */
      public String getJCEProviderName() {
         return this._signatureAlgorithm.engineGetJCEProviderName();
  @@ -285,7 +286,7 @@
       * which is executed on the internal {@link java.security.Signature} object.
       *
       * @param signature
  -    * @return
  +    * @return true if if the signature is valid.
       * 
       * @throws XMLSignatureException
       */
  @@ -329,6 +330,7 @@
       * @param algorithmURI algorithmURI URI representation of <code>Transform algorithm</code>.
       * @param implementingClass <code>implementingClass</code> the implementing class of {@link SignatureAlgorithmSpi}
       * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI is already registered
  +    * @throws XMLSignatureException 
       */
      public static void register(String algorithmURI, String implementingClass)
              throws AlgorithmAlreadyRegisteredException,XMLSignatureException {
  @@ -371,7 +373,7 @@
       * Method getImplementingClass
       *
       * @param URI
  -    * @return
  +    * @return the class that implements the URI
       */
      private static Class getImplementingClass(String URI) {
   
  @@ -385,7 +387,7 @@
      /**
       * Method getBaseNamespace
       *
  -    * @return
  +    * @return URI of this element
       */
      public String getBaseNamespace() {
         return Constants.SignatureSpecNS;
  @@ -394,7 +396,7 @@
      /**
       * Method getBaseLocalName
       *
  -    * @return
  +    * @return Local name
       */
      public String getBaseLocalName() {
         return Constants._TAG_SIGNATUREMETHOD;
  
  
  
  1.11      +2 -11     xml-security/src/org/apache/xml/security/algorithms/SignatureAlgorithmSpi.java
  
  Index: SignatureAlgorithmSpi.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/algorithms/SignatureAlgorithmSpi.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- SignatureAlgorithmSpi.java	24 Sep 2004 20:54:27 -0000	1.10
  +++ SignatureAlgorithmSpi.java	2 Apr 2005 18:36:40 -0000	1.11
  @@ -147,7 +147,7 @@
       * which is executed on the internal {@link java.security.Signature} object.
       *
       * @param signature
  -    * @return
  +    * @return true if the signature is correct
       * @throws XMLSignatureException
       */
      protected abstract boolean engineVerify(byte[] signature)
  @@ -188,15 +188,6 @@
      }
   
      /**
  -    * Method engineAddContextToElement
  -    *
  -    * @param element
  -    */
  -   protected void engineAddContextToElement(Element element)
  -   {    	       
  -   }
  -
  -   /**
       * Method engineSetHMACOutputLength
       *
       * @param HMACOutputLength