lang.jython.cvs (date)

[cgroves@xxxxxxxxxxxxxxxxxxxxx]

Revision: 3038
          http://svn.sourceforge.net/jython/?rev=3038&view=rev
Author:   cgroves
Date:     2006-12-31 13:29:19 -0800 (Sun, 31 Dec 2006)

Log Message:
-----------
Commit of akuchling's fix for bug #1599004

Things fixed from his message:

* SHA and MD5 objects lack a .digest_size attribute.
* Successive calls to digest() return different values.
* For digest(), the byte array is converted to a string using the default 
encoding, which produces weird results if it's UTF-8. It should hardwire using 
ISO-8859-1, because we want a 1-to-1 mapping of characters.

I also added a to_bytes method to PyString that handles getting the bytes to
add to a digest.  It takes a String an returns a byte array and will throw an
exception if there are for values in the string above 255.  Using
getBytes("ISO-8859-1") just skips over illegal values.

Modified Paths:
--------------
    trunk/jython/src/org/python/core/PyString.java
    trunk/jython/src/org/python/modules/MD5Object.java
    trunk/jython/src/org/python/modules/SHA1.java
    trunk/jython/src/org/python/modules/sha.java

Modified: trunk/jython/src/org/python/core/PyString.java
===================================================================
--- trunk/jython/src/org/python/core/PyString.java      2006-12-31 21:23:44 UTC 
(rev 3037)
+++ trunk/jython/src/org/python/core/PyString.java      2006-12-31 21:29:19 UTC 
(rev 3038)
@@ -3217,13 +3217,21 @@
     }
 
     private byte[] getBytes() {
-        byte[] buf = new byte[string.length()];
-        string.getBytes(0, string.length(), buf, 0);
-        return buf;
-        //XXX: would rather not use above getBytes since it is deprecated,
-        //     but that breaks zlib.py -- need to figure out why and fix.
-        //return string.getBytes();
+       return to_bytes(string);
     }
+    
+    public static byte[] to_bytes(String s){
+        byte[] bytes = new byte[s.length()];
+        for(int i = 0; i < bytes.length; i++) {
+            char c = s.charAt(i);
+            if(c < 256){
+                bytes[i] = (byte)c;
+            }else{
+                throw Py.ValueError("Strings added to sha hashes must not 
contain characters with value > 255");
+            }
+        }
+        return bytes;
+    }
 
     public Object __tojava__(Class c) {
         if (c.isAssignableFrom(String.class)) {

Modified: trunk/jython/src/org/python/modules/MD5Object.java
===================================================================
--- trunk/jython/src/org/python/modules/MD5Object.java  2006-12-31 21:23:44 UTC 
(rev 3037)
+++ trunk/jython/src/org/python/modules/MD5Object.java  2006-12-31 21:29:19 UTC 
(rev 3038)
@@ -9,6 +9,8 @@
 {
     private String data;
 
+    public int digest_size = 16;
+
     public MD5Object(String s) {
         data = s;
     }

Modified: trunk/jython/src/org/python/modules/SHA1.java
===================================================================
--- trunk/jython/src/org/python/modules/SHA1.java       2006-12-31 21:23:44 UTC 
(rev 3037)
+++ trunk/jython/src/org/python/modules/SHA1.java       2006-12-31 21:29:19 UTC 
(rev 3038)
@@ -43,7 +43,8 @@
 
 package org.python.modules;
 
-import org.python.core.PyString;
+import java.io.UnsupportedEncodingException;
+import org.python.core.*;
 
 /**
  * This class implements the SHA-1 message digest algorithm.
@@ -89,9 +90,9 @@
      */
     private long count;
 
+    public int digest_size = 20;
 
 
-
     /**
      * <b>SPI</b>: Updates the message digest with a byte of new data.
      *
@@ -162,9 +163,6 @@
     private byte[] tmp;
     private int[] w;
 
-    private byte[] digestBits;
-
-
     /**
      * Constructs a SHA-1 message digest.
      */
@@ -242,14 +240,14 @@
     protected byte[] engineDigest(byte[] in, int length)
     {
         byte b[] = java_digest(in, length);
-        engineReset();
         return b;
     }
 
     private byte[] java_digest(byte[] in, int pos)
     {
+       int[] digest_save = (int[]) digest.clone();
         if (pos != 0) System.arraycopy(in, 0, tmp, 0, pos);
-
+       
         tmp[pos++] = (byte)0x80;
 
         if (pos > DATA_LENGTH - 8)
@@ -287,6 +285,7 @@
             buf[off++] = (byte) (d>>>8);
             buf[off++] = (byte)  d;
         }
+       digest = digest_save;
         return buf;
     }
 
@@ -471,8 +470,7 @@
      * to the test vectors.
      */
     public String hexdigest() {
-        if (digestBits == null)
-            digestBits = engineDigest();
+       byte[] digestBits = engineDigest();
 
         StringBuffer sb = new StringBuffer();
         for (int i = 0; i < 20; i++) {
@@ -494,9 +492,12 @@
     );
 
     public String digest() {
-        if (digestBits == null)
-            digestBits = engineDigest();
-        return new String(digestBits);
+       byte[] digestBits = engineDigest();
+       try {
+           return new String(digestBits, "ISO-8859-1");
+       } catch (UnsupportedEncodingException exc) {
+           throw Py.ValueError("encoding not supported"); 
+       }
     }
 
     // XXX should become PyObject and use Py.idstr?

Modified: trunk/jython/src/org/python/modules/sha.java
===================================================================
--- trunk/jython/src/org/python/modules/sha.java        2006-12-31 21:23:44 UTC 
(rev 3037)
+++ trunk/jython/src/org/python/modules/sha.java        2006-12-31 21:29:19 UTC 
(rev 3038)
@@ -2,13 +2,10 @@
 
 package org.python.modules;
 
+import java.io.UnsupportedEncodingException;
 import org.python.core.*;
 
-public class sha {
-    public int blocksize = 1;
-    public int digestsize = 20;
-    public int digest_size = digestsize;
-
+public class sha implements ClassDictInit {
     public static String __doc__ =
         "* Cryptix General License\n" +
         "* Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000 The Cryptix"+
@@ -45,10 +42,10 @@
     public static SHA1 new$(PyObject[] args, String[] kws) {
         ArgParser ap = new ArgParser("sha", args, kws, "string");
         String cp = ap.getString(0, null);
-
         SHA1 n = new SHA1();
-        if (cp != null)
-            n.update(cp.getBytes());
+        if(cp != null) {
+            n.update(PyString.to_bytes(cp));
+        }
         return n;
     }
 
@@ -56,4 +53,11 @@
     public static SHA1 sha$(PyObject[] args, String[] kws) {
         return new$(args, kws);
     }
+
+    public static void classDictInit(PyObject dict) {
+        dict.__setitem__("digest_size", Py.newInteger(20));
+        dict.__setitem__("digestsize", Py.newInteger(20));
+        dict.__setitem__("blocksize", Py.newInteger(1));
+        dict.__setitem__("classDictInit", null);
+    }
 }


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV