[Jython-checkins] jython: HORRIBLE KLUDGE, using sha256 for sha224. Fix before we leave sandbox.
frank.wierzbicki
jython-checkins at python.org
Wed Mar 14 04:09:28 CET 2012
http://hg.python.org/jython/rev/8a80ee87027d
changeset: 6323:8a80ee87027d
user: Frank Wierzbicki <fwierzbicki at gmail.com>
date: Mon Mar 12 13:23:17 2012 -0700
summary:
HORRIBLE KLUDGE, using sha256 for sha224. Fix before we leave sandbox.
files:
src/org/python/modules/_hashlib.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/org/python/modules/_hashlib.java b/src/org/python/modules/_hashlib.java
--- a/src/org/python/modules/_hashlib.java
+++ b/src/org/python/modules/_hashlib.java
@@ -30,6 +30,7 @@
/** A mapping of Python algorithm names to MessageDigest names. */
private static final Map<String, String> algorithmMap = new HashMap<String, String>() {{
put("sha1", "sha-1");
+ put("sha224", "sha-224");
put("sha256", "sha-256");
put("sha384", "sha-384");
put("sha512", "sha-512");
@@ -75,6 +76,16 @@
return new$("sha1", obj);
}
+ public static PyObject openssl_sha224() {
+ return openssl_sha224(null);
+ }
+
+ public static PyObject openssl_sha224(PyObject obj) {
+ //FIXME: WRONG!
+ return new$("sha256", obj);
+ //return new$("sha224", obj);
+ }
+
public static PyObject openssl_sha256() {
return openssl_sha256(null);
}
@@ -118,6 +129,7 @@
private static final Map<String, Integer> blockSizes = new HashMap<String, Integer>() {{
put("md5", 64);
put("sha-1", 64);
+ put("sha-224", 64);
put("sha-256", 64);
put("sha-384", 128);
put("sha-512", 128);
--
Repository URL: http://hg.python.org/jython
More information about the Jython-checkins
mailing list