hugo/native-crypto
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix sha enums

Browse Source
This commit is contained in:
Hugo Pointcheval 2020-12-19 21:42:36 +01:00
parent 43de719ea6
commit a5d3b76b01
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
android/src/main/kotlin/fr/pointcheval/native_crypto/HashAlgorithm.kt
View File

@ -4,8 +4,9 @@ import java.security.MessageDigest
enum class HashAlgorithm(val length : Int) { enum class HashAlgorithm(val length : Int) {
SHA1(160), SHA1(160),
SHA128(128), SHA224(224),
SHA256(256), SHA256(256),
SHA384(384),
SHA512(512); SHA512(512);
} }
@ -14,8 +15,9 @@ class Hash() {
fun digest(data: ByteArray?, algorithm: HashAlgorithm): ByteArray { fun digest(data: ByteArray?, algorithm: HashAlgorithm): ByteArray {
val func : String = when (algorithm) { val func : String = when (algorithm) {
HashAlgorithm.SHA1 -> "SHA-1" HashAlgorithm.SHA1 -> "SHA-1"
HashAlgorithm.SHA128 -> "SHA-128" HashAlgorithm.SHA224 -> "SHA-224"
HashAlgorithm.SHA256 -> "SHA-256" HashAlgorithm.SHA256 -> "SHA-256"
HashAlgorithm.SHA384 -> "SHA-384"
HashAlgorithm.SHA512 -> "SHA-512" HashAlgorithm.SHA512 -> "SHA-512"
} }
val md = MessageDigest.getInstance(func) val md = MessageDigest.getInstance(func)
@ -25,8 +27,9 @@ class Hash() {
fun digest(data: ByteArray?, algorithm: String): ByteArray { fun digest(data: ByteArray?, algorithm: String): ByteArray {
val func : HashAlgorithm = when (algorithm) { val func : HashAlgorithm = when (algorithm) {
"sha1" -> HashAlgorithm.SHA1 "sha1" -> HashAlgorithm.SHA1
"sha128" -> HashAlgorithm.SHA128 "sha224" -> HashAlgorithm.SHA224
"sha256" -> HashAlgorithm.SHA256 "sha256" -> HashAlgorithm.SHA256
"sha384" -> HashAlgorithm.SHA384
"sha512" -> HashAlgorithm.SHA512 "sha512" -> HashAlgorithm.SHA512
else -> HashAlgorithm.SHA256 else -> HashAlgorithm.SHA256
} }

2
android/src/main/kotlin/fr/pointcheval/native_crypto/KeyDerivation.kt
View File

@ -12,7 +12,7 @@ class KeyDerivation {
"sha1" to "PBKDF2withHmacSHA1", "sha1" to "PBKDF2withHmacSHA1",
"sha224" to "PBKDF2withHmacSHA224", "sha224" to "PBKDF2withHmacSHA224",
"sha256" to "PBKDF2WithHmacSHA256", "sha256" to "PBKDF2WithHmacSHA256",
"sha284" to "PBKDF2withHmacSHA384", "sha384" to "PBKDF2withHmacSHA384",
"sha512" to "PBKDF2withHmacSHA512" "sha512" to "PBKDF2withHmacSHA512"
) )

2
lib/src/digest.dart
View File

@ -7,7 +7,7 @@ import 'exceptions.dart';
import 'platform.dart'; import 'platform.dart';
import 'utils.dart'; import 'utils.dart';
enum HashAlgorithm { SHA1, SHA128, SHA256, SHA512 } enum HashAlgorithm { SHA1, SHA224, SHA256, SHA384, SHA512 }
/// Represents message digest, or hash function. /// Represents message digest, or hash function.
class MessageDigest { class MessageDigest {