Skip to content

Commit

Permalink
[java/jvm] use native SHA-1 and SHA-256 methods (see #9298)
Browse files Browse the repository at this point in the history
there's a little bit of copy-paste going on here but oh well
  • Loading branch information
nadako committed Apr 10, 2020
1 parent cc6fc0b commit 7cee77c
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 1 deletion.
2 changes: 1 addition & 1 deletion std/haxe/crypto/Sha256.hx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class Sha256 {
return out;
}

public function new() {}
function new() {}

function doEncode(m:Array<Int>, l:Int):Array<Int> {
var K:Array<Int> = [
Expand Down
42 changes: 42 additions & 0 deletions std/java/_std/haxe/crypto/Sha1.hx
Original file line number Diff line number Diff line change
@@ -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);
}
}
42 changes: 42 additions & 0 deletions std/java/_std/haxe/crypto/Sha256.hx
Original file line number Diff line number Diff line change
@@ -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);
}
}

0 comments on commit 7cee77c

Please sign in to comment.