From 7cee77ca6dafce4012ac0eb5c18e9c75c45064c5 Mon Sep 17 00:00:00 2001 From: Dan Korostelev Date: Fri, 10 Apr 2020 15:33:07 +0200 Subject: [PATCH] [java/jvm] use native SHA-1 and SHA-256 methods (see #9298) there's a little bit of copy-paste going on here but oh well --- std/haxe/crypto/Sha256.hx | 2 +- std/java/_std/haxe/crypto/Sha1.hx | 42 +++++++++++++++++++++++++++++ std/java/_std/haxe/crypto/Sha256.hx | 42 +++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 std/java/_std/haxe/crypto/Sha1.hx create mode 100644 std/java/_std/haxe/crypto/Sha256.hx diff --git a/std/haxe/crypto/Sha256.hx b/std/haxe/crypto/Sha256.hx index cc144525e6b..0fbf1a4f57f 100644 --- a/std/haxe/crypto/Sha256.hx +++ b/std/haxe/crypto/Sha256.hx @@ -45,7 +45,7 @@ class Sha256 { return out; } - public function new() {} + function new() {} function doEncode(m:Array, l:Int):Array { var K:Array = [ diff --git a/std/java/_std/haxe/crypto/Sha1.hx b/std/java/_std/haxe/crypto/Sha1.hx new file mode 100644 index 00000000000..075228b51ce --- /dev/null +++ b/std/java/_std/haxe/crypto/Sha1.hx @@ -0,0 +1,42 @@ +/* + * Copyright (C)2005-2019 Haxe Foundation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ +package haxe.crypto; + +import haxe.io.Bytes; +import haxe.io.BytesData; +import java.security.MessageDigest; +import java.nio.charset.StandardCharsets; + +@:coreApi +class Sha1 { + public static function encode(s:String):String { + return Bytes.ofData(digest((cast s : java.NativeString).getBytes(StandardCharsets.UTF_8))).toHex(); + } + + public static function make(b:haxe.io.Bytes):haxe.io.Bytes { + return Bytes.ofData(digest(b.getData())); + } + + inline static function digest(b:BytesData):BytesData { + return MessageDigest.getInstance("SHA-1").digest(b); + } +} diff --git a/std/java/_std/haxe/crypto/Sha256.hx b/std/java/_std/haxe/crypto/Sha256.hx new file mode 100644 index 00000000000..0ad4d3ce7aa --- /dev/null +++ b/std/java/_std/haxe/crypto/Sha256.hx @@ -0,0 +1,42 @@ +/* + * Copyright (C)2005-2019 Haxe Foundation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ +package haxe.crypto; + +import haxe.io.Bytes; +import haxe.io.BytesData; +import java.security.MessageDigest; +import java.nio.charset.StandardCharsets; + +@:coreApi +class Sha256 { + public static function encode(s:String):String { + return Bytes.ofData(digest((cast s : java.NativeString).getBytes(StandardCharsets.UTF_8))).toHex(); + } + + public static function make(b:haxe.io.Bytes):haxe.io.Bytes { + return Bytes.ofData(digest(b.getData())); + } + + inline static function digest(b:BytesData):BytesData { + return MessageDigest.getInstance("SHA-256").digest(b); + } +}