From 34754a6bc0450c230831da45734d5bd5f318cba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Guimar=C3=A3es?= Date: Sun, 5 Apr 2015 17:17:42 -0300 Subject: [PATCH] fixes Md5 native constructor. --- jni/jni_md5.c | 77 ++++----------------------------------------------- 1 file changed, 6 insertions(+), 71 deletions(-) diff --git a/jni/jni_md5.c b/jni/jni_md5.c index 0a2ea02..9ea63ad 100644 --- a/jni/jni_md5.c +++ b/jni/jni_md5.c @@ -2,91 +2,26 @@ #include #include -#include -#include -#include +#include /* #define WOLFCRYPT_JNI_DEBUG_ON */ #include -JNIEXPORT jlong JNICALL Java_com_wolfssl_wolfcrypt_Sha_mallocNativeStruct( +JNIEXPORT jlong JNICALL Java_com_wolfssl_wolfcrypt_Md5_mallocNativeStruct( JNIEnv* env, jobject this) { jlong ret = 0; -#ifdef NO_SHA +#ifdef NO_MD5 throwNotCompiledInException(env); #else - ret = (jlong) XMALLOC(sizeof(Sha), NULL, DYNAMIC_TYPE_TMP_BUFFER); + ret = (jlong) XMALLOC(sizeof(Md5), NULL, DYNAMIC_TYPE_TMP_BUFFER); if (!ret) - throwOutOfMemoryException(env, "Failed to allocate Sha object"); + throwOutOfMemoryException(env, "Failed to allocate Md5 object"); - LogStr("new Sha() = %p\n", ret); - -#endif - - return ret; -} - -JNIEXPORT jlong JNICALL Java_com_wolfssl_wolfcrypt_Sha256_mallocNativeStruct( - JNIEnv* env, jobject this) -{ - jlong ret = 0; - -#ifdef NO_SHA256 - throwNotCompiledInException(env); -#else - - ret = (jlong) XMALLOC(sizeof(Sha256), NULL, DYNAMIC_TYPE_TMP_BUFFER); - - if (!ret) - throwOutOfMemoryException(env, "Failed to allocate Sha256 object"); - - LogStr("new Sha256() = %p\n", ret); - -#endif - - return ret; -} - -JNIEXPORT jlong JNICALL Java_com_wolfssl_wolfcrypt_Sha384_mallocNativeStruct( - JNIEnv* env, jobject this) -{ - jlong ret = 0; - -#ifndef WOLFSSL_SHA512 - throwNotCompiledInException(env); -#else - - ret = (jlong) XMALLOC(sizeof(Sha384), NULL, DYNAMIC_TYPE_TMP_BUFFER); - - if (!ret) - throwOutOfMemoryException(env, "Failed to allocate Sha384 object"); - - LogStr("new Sha384() = %p\n", ret); - -#endif - - return ret; -} - -JNIEXPORT jlong JNICALL Java_com_wolfssl_wolfcrypt_Sha512_mallocNativeStruct( - JNIEnv* env, jobject this) -{ - jlong ret = 0; - -#ifndef WOLFSSL_SHA512 - throwNotCompiledInException(env); -#else - - ret = (jlong) XMALLOC(sizeof(Sha512), NULL, DYNAMIC_TYPE_TMP_BUFFER); - - if (!ret) - throwOutOfMemoryException(env, "Failed to allocate Sha512 object"); - - LogStr("new Sha512() = %p\n", ret); + LogStr("new Md5() = %p\n", ret); #endif