Commits

Frank Wierzbicki  committed 6a58525 Draft

_hashlib will support sha224 in a future JDK with it. Update test_support.

  • Participants
  • Parent commits ca58a02

Comments (0)

Files changed (2)

File Lib/test/test_support.py

 
 import contextlib
 import errno
+import functools
 import socket
 import sys
 import os
 import unittest
 import importlib
 import re
+try:
+    import thread
+except ImportError:
+    thread = None
+
 
 __all__ = ["Error", "TestFailed", "ResourceDenied", "import_module",
            "verbose", "use_resources", "max_memuse", "record_original_stdout",

File src/org/python/modules/_hashlib.java

     }
 
     public static PyObject openssl_sha224(PyObject obj) {
-        //FIXME: WRONG!
-        return new$("sha256", obj);
-        //return new$("sha224", obj);
+        return new$("sha224", obj);
     }
 
     public static PyObject openssl_sha256() {
         private static final Map<String, Integer> blockSizes = new HashMap<String, Integer>() {{
                 put("md5", 64);
                 put("sha-1", 64);
-                //put("sha-224", 64);
+                put("sha-224", 64);
                 put("sha-256", 64);
                 put("sha-384", 128);
                 put("sha-512", 128);