1 files changed, 4 insertions, 21 deletions

diff --git a/tools/gnu/classpath/tools/jarsigner/SFHelper.java b/tools/gnu/classpath/tools/jarsigner/SFHelper.java
index cbf5f356b..38caa44aa 100644
--- a/tools/gnu/classpath/tools/jarsigner/SFHelper.java
+++ b/tools/gnu/classpath/tools/jarsigner/SFHelper.java
@@ -16,24 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
+02110-1301 USA. */
 
 
 package gnu.classpath.tools.jarsigner;
@@ -331,7 +314,7 @@ public class SFHelper
         manifest.getEntries().put(name, mainfestAttributes);
       }
 
-    mainfestAttributes.putValue(Main.DIGEST_ATTR, hash);
+    mainfestAttributes.putValue(Main.DIGEST, hash);
 
     // hash the newly added 2-header block and add it as an attribute to .SF
 
@@ -343,7 +326,7 @@ public class SFHelper
         sfEntries.put(name, sfAttributes);
       }
 
-    sfAttributes.putValue(Main.DIGEST_ATTR, sfHash);
+    sfAttributes.putValue(Main.DIGEST, sfHash);
     log.finest("Name: " + name);
     log.finest(Main.DIGEST + ": " + sfHash);
     log.finest("");
@@ -366,7 +349,7 @@ public class SFHelper
     baos.flush();
     String manifestHash = util.hashByteArray(baos.toByteArray());
     log.fine("Hashed Manifest " + manifestHash);
-    sfMainAttributes.putValue(Main.DIGEST_MANIFEST_ATTR, manifestHash);
+    sfMainAttributes.putValue(Main.DIGEST_MANIFEST, manifestHash);
 
     this.state = FINISHED;
   }