summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/cz/crcs/ectester/standalone/libs/jni/Makefile2
-rw-r--r--src/cz/crcs/ectester/standalone/libs/jni/botan.cpp10
-rw-r--r--src/cz/crcs/ectester/standalone/libs/jni/cryptopp.cpp14
-rw-r--r--src/cz/crcs/ectester/standalone/libs/jni/openssl.c12
-rw-r--r--src/cz/crcs/ectester/standalone/libs/jni/tomcrypt.c8
5 files changed, 23 insertions, 23 deletions
diff --git a/src/cz/crcs/ectester/standalone/libs/jni/Makefile b/src/cz/crcs/ectester/standalone/libs/jni/Makefile
index 14491bb..22e41cb 100644
--- a/src/cz/crcs/ectester/standalone/libs/jni/Makefile
+++ b/src/cz/crcs/ectester/standalone/libs/jni/Makefile
@@ -38,7 +38,7 @@ CC?=gcc
CXX?=g++
STRIP?=strip
-LFLAGS+="-fPIC -g -shared"
+LFLAGS+=-fPIC -g -shared
CFLAGS+=-fPIC -g -I"$(JNI_INCLUDEDIR)" -I"$(JNI_PLATFORMINCLUDEDIR)" -I.
CXXFLAGS+=-fPIC -g -I"$(JNI_INCLUDEDIR)" -I"$(JNI_PLATFORMINCLUDEDIR)" -I.
diff --git a/src/cz/crcs/ectester/standalone/libs/jni/botan.cpp b/src/cz/crcs/ectester/standalone/libs/jni/botan.cpp
index a37cb88..d506ecd 100644
--- a/src/cz/crcs/ectester/standalone/libs/jni/botan.cpp
+++ b/src/cz/crcs/ectester/standalone/libs/jni/botan.cpp
@@ -134,7 +134,7 @@ static jobject biginteger_from_bigint(JNIEnv *env, const Botan::BigInt& bigint)
jbyteArray bigint_array = env->NewByteArray(bigint_data.size());
jbyte * bigint_bytes = env->GetByteArrayElements(bigint_array, NULL);
std::copy(bigint_data.begin(), bigint_data.end(), bigint_bytes);
- env->ReleaseByteArrayElements(bigint_array, bigint_bytes, JNI_COMMIT);
+ env->ReleaseByteArrayElements(bigint_array, bigint_bytes, 0);
jmethodID biginteger_init = env->GetMethodID(biginteger_class, "<init>", "(I[B)V");
return env->NewObject(biginteger_class, biginteger_init, (jint) 1, bigint_array);
@@ -271,7 +271,7 @@ static jobject generate_from_group(JNIEnv* env, jobject self, Botan::EC_Group gr
jbyteArray pub_bytearray = env->NewByteArray(pub_data.size());
jbyte *pub_bytes = env->GetByteArrayElements(pub_bytearray, NULL);
std::copy(pub_data.begin(), pub_data.end(), pub_bytes);
- env->ReleaseByteArrayElements(pub_bytearray, pub_bytes, JNI_COMMIT);
+ env->ReleaseByteArrayElements(pub_bytearray, pub_bytes, 0);
jobject ec_pub_param_spec = env->NewLocalRef(ec_param_spec);
jmethodID ec_pub_init = env->GetMethodID(pubkey_class, "<init>", "([BLjava/security/spec/ECParameterSpec;)V");
@@ -283,7 +283,7 @@ static jobject generate_from_group(JNIEnv* env, jobject self, Botan::EC_Group gr
jbyteArray priv_bytearray = env->NewByteArray(priv_data.size());
jbyte *priv_bytes = env->GetByteArrayElements(priv_bytearray, NULL);
std::copy(priv_data.begin(), priv_data.end(), priv_bytes);
- env->ReleaseByteArrayElements(priv_bytearray, priv_bytes, JNI_COMMIT);
+ env->ReleaseByteArrayElements(priv_bytearray, priv_bytes, 0);
jobject ec_priv_param_spec = env->NewLocalRef(ec_param_spec);
jmethodID ec_priv_init = env->GetMethodID(privkey_class, "<init>", "([BLjava/security/spec/ECParameterSpec;)V");
@@ -375,7 +375,7 @@ JNIEXPORT jbyteArray JNICALL Java_cz_crcs_ectester_standalone_libs_jni_NativeKey
jbyteArray result = env->NewByteArray(derived.size());
jbyte *result_data = env->GetByteArrayElements(result, NULL);
std::copy(derived.begin(), derived.end(), result_data);
- env->ReleaseByteArrayElements(result, result_data, JNI_COMMIT);
+ env->ReleaseByteArrayElements(result, result_data, 0);
return result;
}
@@ -438,7 +438,7 @@ JNIEXPORT jbyteArray JNICALL Java_cz_crcs_ectester_standalone_libs_jni_NativeSig
jbyteArray result = env->NewByteArray(sig.size());
jbyte *result_data = env->GetByteArrayElements(result, NULL);
std::copy(sig.begin(), sig.end(), result_data);
- env->ReleaseByteArrayElements(result, result_data, JNI_COMMIT);
+ env->ReleaseByteArrayElements(result, result_data, 0);
return result;
}
diff --git a/src/cz/crcs/ectester/standalone/libs/jni/cryptopp.cpp b/src/cz/crcs/ectester/standalone/libs/jni/cryptopp.cpp
index 0ba026f..0107d0d 100644
--- a/src/cz/crcs/ectester/standalone/libs/jni/cryptopp.cpp
+++ b/src/cz/crcs/ectester/standalone/libs/jni/cryptopp.cpp
@@ -227,7 +227,7 @@ static jobject biginteger_from_integer(JNIEnv *env, const Integer &integer) {
jbyte *bigint_bytes = env->GetByteArrayElements(byte_array, NULL);
integer.Encode((byte *) bigint_bytes, integer.MinEncodedSize());
- env->ReleaseByteArrayElements(byte_array, bigint_bytes, JNI_COMMIT);
+ env->ReleaseByteArrayElements(byte_array, bigint_bytes, 0);
jmethodID biginteger_init = env->GetMethodID(biginteger_class, "<init>", "(I[B)V");
return env->NewObject(biginteger_class, biginteger_init, (jint) 1, byte_array);
@@ -239,7 +239,7 @@ static jobject biginteger_from_polmod2(JNIEnv *env, const PolynomialMod2 &polmod
jbyteArray mod_array = env->NewByteArray(polmod.MinEncodedSize());
jbyte *mod_data = env->GetByteArrayElements(mod_array, NULL);
polmod.Encode((byte *) mod_data, polmod.MinEncodedSize());
- env->ReleaseByteArrayElements(mod_array, mod_data, JNI_COMMIT);
+ env->ReleaseByteArrayElements(mod_array, mod_data, 0);
return env->NewObject(biginteger_class, biginteger_init, (jint) 1, mod_array);
}
@@ -472,7 +472,7 @@ template <> jobject params_from_group<EC2N>(JNIEnv *env, DL_GroupParameters_EC<E
ks_data[found++] = i;
}
}
- env->ReleaseIntArrayElements(ks, ks_data, JNI_COMMIT);
+ env->ReleaseIntArrayElements(ks, ks_data, 0);
jmethodID f2m_field_init = env->GetMethodID(f2m_field_class, "<init>", "(I[I)V");
jobject field = env->NewObject(f2m_field_class, f2m_field_init, (jint) m, ks);
@@ -501,7 +501,7 @@ template <class EC> jobject generate_from_group(JNIEnv *env, DL_GroupParameters_
jbyteArray pub_bytearray = env->NewByteArray(pub.SizeInBytes());
jbyte *pub_bytes = env->GetByteArrayElements(pub_bytearray, NULL);
std::copy(pub.BytePtr(), pub.BytePtr()+pub.SizeInBytes(), pub_bytes);
- env->ReleaseByteArrayElements(pub_bytearray, pub_bytes, JNI_COMMIT);
+ env->ReleaseByteArrayElements(pub_bytearray, pub_bytes, 0);
jobject ec_pub_param_spec = env->NewLocalRef(params);
jmethodID ec_pub_init = env->GetMethodID(pubkey_class, "<init>", "([BLjava/security/spec/ECParameterSpec;)V");
@@ -510,7 +510,7 @@ template <class EC> jobject generate_from_group(JNIEnv *env, DL_GroupParameters_
jbyteArray priv_bytearray = env->NewByteArray(priv.SizeInBytes());
jbyte *priv_bytes = env->GetByteArrayElements(priv_bytearray, NULL);
std::copy(priv.BytePtr(), priv.BytePtr()+priv.SizeInBytes(), priv_bytes);
- env->ReleaseByteArrayElements(priv_bytearray, priv_bytes, JNI_COMMIT);
+ env->ReleaseByteArrayElements(priv_bytearray, priv_bytes, 0);
jobject ec_priv_param_spec = env->NewLocalRef(params);
jmethodID ec_priv_init = env->GetMethodID(privkey_class, "<init>", "([BLjava/security/spec/ECParameterSpec;)V");
@@ -593,7 +593,7 @@ JNIEXPORT jbyteArray JNICALL Java_cz_crcs_ectester_standalone_libs_jni_NativeKey
jbyteArray result = env->NewByteArray(secret->size());
jbyte *result_data = env->GetByteArrayElements(result, NULL);
std::copy(secret->begin(), secret->end(), result_data);
- env->ReleaseByteArrayElements(result, result_data, JNI_COMMIT);
+ env->ReleaseByteArrayElements(result, result_data, 0);
return result;
}
@@ -617,7 +617,7 @@ jbyteArray sign_message(JNIEnv *env, DL_GroupParameters_EC<EC> group, jbyteArray
jbyteArray result = env->NewByteArray(len);
jbyte *result_bytes = env->GetByteArrayElements(result, NULL);
std::copy(signature.begin(), signature.end(), result_bytes);
- env->ReleaseByteArrayElements(result, result_bytes, JNI_COMMIT);
+ env->ReleaseByteArrayElements(result, result_bytes, 0);
return result;
}
diff --git a/src/cz/crcs/ectester/standalone/libs/jni/openssl.c b/src/cz/crcs/ectester/standalone/libs/jni/openssl.c
index 3916cec..259630c 100644
--- a/src/cz/crcs/ectester/standalone/libs/jni/openssl.c
+++ b/src/cz/crcs/ectester/standalone/libs/jni/openssl.c
@@ -89,7 +89,7 @@ static jobject bignum_to_biginteger(JNIEnv *env, const BIGNUM *bn) {
jbyteArray bytes = (*env)->NewByteArray(env, size);
jbyte *data = (*env)->GetByteArrayElements(env, bytes, NULL);
BN_bn2bin(bn, data);
- (*env)->ReleaseByteArrayElements(env, bytes, data, JNI_COMMIT);
+ (*env)->ReleaseByteArrayElements(env, bytes, data, 0);
jobject result = (*env)->NewObject(env, biginteger_class, biginteger_init, 1, bytes);
return result;
}
@@ -304,7 +304,7 @@ static jobject create_ec_param_spec(JNIEnv *env, const EC_GROUP *curve) {
} else {
return NULL;
}
- (*env)->ReleaseIntArrayElements(env, ks, ks_data, JNI_COMMIT);
+ (*env)->ReleaseIntArrayElements(env, ks, ks_data, 0);
jint m = EC_GROUP_get_degree(curve);
@@ -363,13 +363,13 @@ static jobject generate_from_curve(JNIEnv *env, const EC_GROUP *curve) {
jbyteArray priv_bytes = (*env)->NewByteArray(env, key_bytes);
jbyte *key_priv = (*env)->GetByteArrayElements(env, priv_bytes, NULL);
BN_bn2binpad(EC_KEY_get0_private_key(key), key_priv, key_bytes);
- (*env)->ReleaseByteArrayElements(env, priv_bytes, key_priv, JNI_COMMIT);
+ (*env)->ReleaseByteArrayElements(env, priv_bytes, key_priv, 0);
unsigned long key_len = 2*key_bytes + 1;
jbyteArray pub_bytes = (*env)->NewByteArray(env, key_len);
jbyte *key_pub = (*env)->GetByteArrayElements(env, pub_bytes, NULL);
EC_POINT_point2oct(curve, EC_KEY_get0_public_key(key), POINT_CONVERSION_UNCOMPRESSED, key_pub, key_len, NULL);
- (*env)->ReleaseByteArrayElements(env, pub_bytes, key_pub, JNI_COMMIT);
+ (*env)->ReleaseByteArrayElements(env, pub_bytes, key_pub, 0);
EC_KEY_free(key);
@@ -493,7 +493,7 @@ JNIEXPORT jbyteArray JNICALL Java_cz_crcs_ectester_standalone_libs_jni_NativeKey
(*env)->ReleaseByteArrayElements(env, result, result_data, JNI_ABORT);
return NULL;
}
- (*env)->ReleaseByteArrayElements(env, result, result_data, JNI_COMMIT);
+ (*env)->ReleaseByteArrayElements(env, result, result_data, 0);
EC_KEY_free(pub);
EC_KEY_free(priv);
@@ -526,7 +526,7 @@ JNIEXPORT jbyteArray JNICALL Java_cz_crcs_ectester_standalone_libs_jni_NativeSig
jbyte *result_data = (*env)->GetByteArrayElements(env, result, NULL);
jbyte *result_data_ptr = result_data;
i2d_ECDSA_SIG(signature, (unsigned char **)&result_data_ptr);
- (*env)->ReleaseByteArrayElements(env, result, result_data, JNI_COMMIT);
+ (*env)->ReleaseByteArrayElements(env, result, result_data, 0);
ECDSA_SIG_free(signature);
EC_KEY_free(priv);
diff --git a/src/cz/crcs/ectester/standalone/libs/jni/tomcrypt.c b/src/cz/crcs/ectester/standalone/libs/jni/tomcrypt.c
index dc3abd9..b62dd61 100644
--- a/src/cz/crcs/ectester/standalone/libs/jni/tomcrypt.c
+++ b/src/cz/crcs/ectester/standalone/libs/jni/tomcrypt.c
@@ -241,7 +241,7 @@ static jobject generate_from_curve(JNIEnv *env, const ltc_ecc_set_type *curve) {
jbyteArray pub_bytes = (*env)->NewByteArray(env, key_len);
jbyte *key_pub = (*env)->GetByteArrayElements(env, pub_bytes, NULL);
ecc_ansi_x963_export(&key, key_pub, &key_len);
- (*env)->ReleaseByteArrayElements(env, pub_bytes, key_pub, JNI_COMMIT);
+ (*env)->ReleaseByteArrayElements(env, pub_bytes, key_pub, 0);
jobject ec_param_spec = create_ec_param_spec(env, curve);
@@ -252,7 +252,7 @@ static jobject generate_from_curve(JNIEnv *env, const ltc_ecc_set_type *curve) {
jbyteArray priv_bytes = (*env)->NewByteArray(env, curve->size);
jbyte *key_priv = (*env)->GetByteArrayElements(env, priv_bytes, NULL);
ltc_mp.unsigned_write(key.k, key_priv);
- (*env)->ReleaseByteArrayElements(env, priv_bytes, key_priv, JNI_COMMIT);
+ (*env)->ReleaseByteArrayElements(env, priv_bytes, key_priv, 0);
jobject ec_priv_param_spec = (*env)->NewLocalRef(env, ec_param_spec);
jmethodID ec_priv_init = (*env)->GetMethodID(env, privkey_class, "<init>", "([BLjava/security/spec/ECParameterSpec;)V");
@@ -379,7 +379,7 @@ JNIEXPORT jbyteArray JNICALL Java_cz_crcs_ectester_standalone_libs_jni_NativeKey
jbyteArray output = (*env)->NewByteArray(env, curve->size);
jbyte *output_data = (*env)->GetByteArrayElements(env, output, NULL);
memcpy(output_data, result, curve->size);
- (*env)->ReleaseByteArrayElements(env, output, output_data, JNI_COMMIT);
+ (*env)->ReleaseByteArrayElements(env, output, output_data, 0);
ltc_cleanup_multi(&pub.pubkey.x, &pub.pubkey.y, &pub.pubkey.z, &priv.k, NULL);
free(curve);
@@ -413,7 +413,7 @@ JNIEXPORT jbyteArray JNICALL Java_cz_crcs_ectester_standalone_libs_jni_NativeSig
jbyteArray output = (*env)->NewByteArray(env, output_len);
jbyte *output_data = (*env)->GetByteArrayElements(env, output, NULL);
memcpy(output_data, result, output_len);
- (*env)->ReleaseByteArrayElements(env, output, output_data, JNI_COMMIT);
+ (*env)->ReleaseByteArrayElements(env, output, output_data, 0);
free(curve);
return output;
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2025-11-08 17:21:48 +0000