From 8505947e618e69c946a6e2798e35092b10d37b16 Mon Sep 17 00:00:00 2001 From: Xiaochen Nie Date: Mon, 17 Feb 2020 21:52:59 +0800 Subject: [PATCH] [bugFix] Fix java wrapper import issue by adding package name org.gmssl --- java/GmSSL.c | 352 +++++++++++++++++++++++------------------------ java/GmSSL.h | 48 +++---- java/GmSSL.java | 1 + java/gmssl_err.c | 72 +++++----- java/gmssl_err.h | 46 +++---- 5 files changed, 260 insertions(+), 259 deletions(-) diff --git a/java/GmSSL.c b/java/GmSSL.c index 8905192d..00fde527 100755 --- a/java/GmSSL.c +++ b/java/GmSSL.c @@ -82,7 +82,7 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *vm, void *reserved) ERR_unload_JNI_strings(); } -JNIEXPORT jobjectArray JNICALL Java_GmSSL_getVersions(JNIEnv *env, jobject this) +JNIEXPORT jobjectArray JNICALL Java_org_gmssl_GmSSL_getVersions(JNIEnv *env, jobject this) { jobjectArray ret = NULL; int i; @@ -90,7 +90,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getVersions(JNIEnv *env, jobject this) if (!(ret = (jobjectArray)(*env)->NewObjectArray(env, 7, (*env)->FindClass(env, "java/lang/String"), (*env)->NewStringUTF(env, "")))) { - JNIerr(JNI_F_JAVA_GMSSL_GETVERSIONS, JNI_R_JNI_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETVERSIONS, JNI_R_JNI_MALLOC_FAILURE); return NULL; } @@ -105,28 +105,28 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getVersions(JNIEnv *env, jobject this) return ret; } -JNIEXPORT jbyteArray JNICALL Java_GmSSL_generateRandom( +JNIEXPORT jbyteArray JNICALL Java_org_gmssl_GmSSL_generateRandom( JNIEnv *env, jobject this, jint outlen) { jbyteArray ret = NULL; jbyte *outbuf = NULL; if (outlen <= 0 || outlen >= INT_MAX) { - JNIerr(JNI_F_JAVA_GMSSL_GENERATERANDOM, JNI_R_INVALID_LENGTH); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GENERATERANDOM, JNI_R_INVALID_LENGTH); return NULL; } if (!(outbuf = OPENSSL_malloc(outlen))) { - JNIerr(JNI_F_JAVA_GMSSL_GENERATERANDOM, ERR_R_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GENERATERANDOM, ERR_R_MALLOC_FAILURE); goto end; } if (!RAND_bytes((unsigned char *)outbuf, outlen)) { - JNIerr(JNI_F_JAVA_GMSSL_GENERATERANDOM, JNI_R_GMSSL_RNG_ERROR); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GENERATERANDOM, JNI_R_GMSSL_RNG_ERROR); goto end; } if (!(ret = (*env)->NewByteArray(env, outlen))) { - JNIerr(JNI_F_JAVA_GMSSL_GENERATERANDOM, JNI_R_JNI_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GENERATERANDOM, JNI_R_JNI_MALLOC_FAILURE); goto end; } @@ -148,7 +148,7 @@ static void list_cipher_fn(const EVP_CIPHER *c, } } -JNIEXPORT jobjectArray JNICALL Java_GmSSL_getCiphers( +JNIEXPORT jobjectArray JNICALL Java_org_gmssl_GmSSL_getCiphers( JNIEnv *env, jobject this) { jobjectArray ret = NULL; @@ -156,7 +156,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getCiphers( int i; if (!(sk = sk_OPENSSL_CSTRING_new_null())) { - JNIerr(JNI_F_JAVA_GMSSL_GETCIPHERS, ERR_R_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETCIPHERS, ERR_R_MALLOC_FAILURE); goto end; } @@ -166,7 +166,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getCiphers( sk_OPENSSL_CSTRING_num(sk), (*env)->FindClass(env, "java/lang/String"), (*env)->NewStringUTF(env, "")))) { - JNIerr(JNI_F_JAVA_GMSSL_GETCIPHERS, JNI_R_JNI_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETCIPHERS, JNI_R_JNI_MALLOC_FAILURE); goto end; } @@ -180,7 +180,7 @@ end: return ret; } -JNIEXPORT jint JNICALL Java_GmSSL_getCipherIVLength( +JNIEXPORT jint JNICALL Java_org_gmssl_GmSSL_getCipherIVLength( JNIEnv *env, jobject this, jstring algor) { jint ret = -1; @@ -188,12 +188,12 @@ JNIEXPORT jint JNICALL Java_GmSSL_getCipherIVLength( const EVP_CIPHER *cipher; if (!(alg = (*env)->GetStringUTFChars(env, algor, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_GETCIPHERIVLENGTH, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETCIPHERIVLENGTH, JNI_R_BAD_ARGUMENT); goto end; } if (!(cipher = EVP_get_cipherbyname(alg))) { - JNIerr(JNI_F_JAVA_GMSSL_GETCIPHERIVLENGTH, JNI_R_INVALID_CIPHER); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETCIPHERIVLENGTH, JNI_R_INVALID_CIPHER); goto end; } @@ -204,7 +204,7 @@ end: return ret; } -JNIEXPORT jint JNICALL Java_GmSSL_getCipherKeyLength( +JNIEXPORT jint JNICALL Java_org_gmssl_GmSSL_getCipherKeyLength( JNIEnv *env, jobject this, jstring algor) { jint ret = -1; @@ -212,12 +212,12 @@ JNIEXPORT jint JNICALL Java_GmSSL_getCipherKeyLength( const EVP_CIPHER *cipher; if (!(alg = (*env)->GetStringUTFChars(env, algor, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_GETCIPHERKEYLENGTH, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETCIPHERKEYLENGTH, JNI_R_BAD_ARGUMENT); goto end; } if (!(cipher = EVP_get_cipherbyname(alg))) { - JNIerr(JNI_F_JAVA_GMSSL_GETCIPHERKEYLENGTH, JNI_R_INVALID_CIPHER); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETCIPHERKEYLENGTH, JNI_R_INVALID_CIPHER); goto end; } @@ -228,7 +228,7 @@ end: return ret; } -JNIEXPORT jint JNICALL Java_GmSSL_getCipherBlockSize( +JNIEXPORT jint JNICALL Java_org_gmssl_GmSSL_getCipherBlockSize( JNIEnv *env, jobject this, jstring algor) { jint ret = -1; @@ -236,12 +236,12 @@ JNIEXPORT jint JNICALL Java_GmSSL_getCipherBlockSize( const EVP_CIPHER *cipher; if (!(alg = (*env)->GetStringUTFChars(env, algor, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_GETCIPHERBLOCKSIZE, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETCIPHERBLOCKSIZE, JNI_R_BAD_ARGUMENT); goto end; } if (!(cipher = EVP_get_cipherbyname(alg))) { - JNIerr(JNI_F_JAVA_GMSSL_GETCIPHERBLOCKSIZE, JNI_R_NONSUPPORTED_CIPHER); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETCIPHERBLOCKSIZE, JNI_R_NONSUPPORTED_CIPHER); goto end; } @@ -252,7 +252,7 @@ end: return ret; } -JNIEXPORT jbyteArray JNICALL Java_GmSSL_symmetricEncrypt( +JNIEXPORT jbyteArray JNICALL Java_org_gmssl_GmSSL_symmetricEncrypt( JNIEnv *env, jobject this, jstring algor, jbyteArray in, jbyteArray key, jbyteArray iv) { @@ -267,23 +267,23 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_symmetricEncrypt( EVP_CIPHER_CTX *cctx = NULL; if (!(alg = (*env)->GetStringUTFChars(env, algor, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICENCRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICENCRYPT, JNI_R_BAD_ARGUMENT); goto end; } if (!(inbuf = (unsigned char *)(*env)->GetByteArrayElements(env, in, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICENCRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICENCRYPT, JNI_R_BAD_ARGUMENT); goto end; } if ((inlen = (*env)->GetArrayLength(env, in)) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICENCRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICENCRYPT, JNI_R_BAD_ARGUMENT); goto end; } if (!(keybuf = (unsigned char *)(*env)->GetByteArrayElements(env, key, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICENCRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICENCRYPT, JNI_R_BAD_ARGUMENT); goto end; } if ((keylen = (*env)->GetArrayLength(env, key)) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICENCRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICENCRYPT, JNI_R_BAD_ARGUMENT); goto end; } /* null IV can be valid input for some ciphers */ @@ -291,41 +291,41 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_symmetricEncrypt( ivlen = (*env)->GetArrayLength(env, iv); if (!(cipher = EVP_get_cipherbyname(alg))) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICENCRYPT, JNI_R_INVALID_CIPHER); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICENCRYPT, JNI_R_INVALID_CIPHER); goto end; } if (keylen != EVP_CIPHER_key_length(cipher)) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICENCRYPT, JNI_R_INVALID_KEY_LENGTH); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICENCRYPT, JNI_R_INVALID_KEY_LENGTH); goto end; } if (ivlen != EVP_CIPHER_iv_length(cipher)) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICENCRYPT, JNI_R_INVALID_IV_LENGTH); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICENCRYPT, JNI_R_INVALID_IV_LENGTH); goto end; } if (!(outbuf = OPENSSL_malloc(inlen + 2 * EVP_CIPHER_block_size(cipher)))) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICENCRYPT, ERR_R_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICENCRYPT, ERR_R_MALLOC_FAILURE); goto end; } if (!(cctx = EVP_CIPHER_CTX_new())) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICENCRYPT, ERR_R_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICENCRYPT, ERR_R_MALLOC_FAILURE); goto end; } if (!EVP_EncryptInit_ex(cctx, cipher, NULL, keybuf, ivbuf)) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICENCRYPT, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICENCRYPT, ERR_R_EVP_LIB); goto end; } if (!EVP_EncryptUpdate(cctx, outbuf, &outlen, inbuf, inlen)) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICENCRYPT, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICENCRYPT, ERR_R_EVP_LIB); goto end; } if (!EVP_EncryptFinal_ex(cctx, outbuf + outlen, &lastlen)) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICENCRYPT, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICENCRYPT, ERR_R_EVP_LIB); goto end; } outlen += lastlen; if (!(ret = (*env)->NewByteArray(env, outlen))) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICENCRYPT, JNI_R_JNI_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICENCRYPT, JNI_R_JNI_MALLOC_FAILURE); goto end; } @@ -341,7 +341,7 @@ end: return ret; } -JNIEXPORT jbyteArray JNICALL Java_GmSSL_symmetricDecrypt( +JNIEXPORT jbyteArray JNICALL Java_org_gmssl_GmSSL_symmetricDecrypt( JNIEnv *env, jobject this, jstring algor, jbyteArray in, jbyteArray key, jbyteArray iv) { @@ -356,23 +356,23 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_symmetricDecrypt( EVP_CIPHER_CTX *cctx = NULL; if (!(alg = (*env)->GetStringUTFChars(env, algor, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICDECRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICDECRYPT, JNI_R_BAD_ARGUMENT); goto end; } if (!(inbuf = (unsigned char *)(*env)->GetByteArrayElements(env, in, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICDECRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICDECRYPT, JNI_R_BAD_ARGUMENT); goto end; } if ((inlen = (*env)->GetArrayLength(env, in)) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICDECRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICDECRYPT, JNI_R_BAD_ARGUMENT); goto end; } if (!(keybuf = (unsigned char *)(*env)->GetByteArrayElements(env, key, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICDECRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICDECRYPT, JNI_R_BAD_ARGUMENT); goto end; } if ((keylen = (*env)->GetArrayLength(env, key)) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICDECRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICDECRYPT, JNI_R_BAD_ARGUMENT); goto end; } ivbuf = (unsigned char *)(*env)->GetByteArrayElements(env, iv, 0); @@ -380,41 +380,41 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_symmetricDecrypt( if (!(cipher = EVP_get_cipherbyname(alg))) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICDECRYPT, JNI_R_INVALID_CIPHER); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICDECRYPT, JNI_R_INVALID_CIPHER); goto end; } if (keylen != EVP_CIPHER_key_length(cipher)) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICDECRYPT, JNI_R_KEY_LENGTH); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICDECRYPT, JNI_R_KEY_LENGTH); goto end; } if (ivlen != EVP_CIPHER_iv_length(cipher)) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICDECRYPT, JNI_R_IV_LENGTH); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICDECRYPT, JNI_R_IV_LENGTH); goto end; } if (!(outbuf = OPENSSL_malloc(inlen))) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICDECRYPT, ERR_R_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICDECRYPT, ERR_R_MALLOC_FAILURE); goto end; } if (!(cctx = EVP_CIPHER_CTX_new())) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICDECRYPT, ERR_R_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICDECRYPT, ERR_R_MALLOC_FAILURE); goto end; } if (!EVP_DecryptInit_ex(cctx, cipher, NULL, keybuf, ivbuf)) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICDECRYPT, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICDECRYPT, ERR_R_EVP_LIB); goto end; } if (!EVP_DecryptUpdate(cctx, outbuf, &outlen, inbuf, inlen)) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICDECRYPT, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICDECRYPT, ERR_R_EVP_LIB); goto end; } if (!EVP_DecryptFinal_ex(cctx, outbuf + outlen, &lastlen)) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICDECRYPT, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICDECRYPT, ERR_R_EVP_LIB); goto end; } outlen += lastlen; if (!(ret = (*env)->NewByteArray(env, outlen))) { - JNIerr(JNI_F_JAVA_GMSSL_SYMMETRICDECRYPT, JNI_R_JNI_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICDECRYPT, JNI_R_JNI_MALLOC_FAILURE); } (*env)->SetByteArrayRegion(env, ret, 0, outlen, (jbyte *)outbuf); @@ -439,7 +439,7 @@ static void list_md_fn(const EVP_MD *md, } } -JNIEXPORT jobjectArray JNICALL Java_GmSSL_getDigests( +JNIEXPORT jobjectArray JNICALL Java_org_gmssl_GmSSL_getDigests( JNIEnv *env, jobject this) { jobjectArray ret = NULL; @@ -447,7 +447,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getDigests( int i; if (!(sk = sk_OPENSSL_CSTRING_new_null())) { - JNIerr(JNI_F_JAVA_GMSSL_GETDIGESTS, ERR_R_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETDIGESTS, ERR_R_MALLOC_FAILURE); goto end; } @@ -457,7 +457,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getDigests( sk_OPENSSL_CSTRING_num(sk), (*env)->FindClass(env, "java/lang/String"), (*env)->NewStringUTF(env, "")))) { - JNIerr(JNI_F_JAVA_GMSSL_GETDIGESTS, JNI_R_JNI_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETDIGESTS, JNI_R_JNI_MALLOC_FAILURE); goto end; } @@ -471,7 +471,7 @@ end: return ret; } -JNIEXPORT jint JNICALL Java_GmSSL_getDigestLength( +JNIEXPORT jint JNICALL Java_org_gmssl_GmSSL_getDigestLength( JNIEnv *env, jobject this, jstring algor) { jint ret = -1; @@ -479,12 +479,12 @@ JNIEXPORT jint JNICALL Java_GmSSL_getDigestLength( const EVP_MD *md; if (!(alg = (*env)->GetStringUTFChars(env, algor, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_GETDIGESTLENGTH, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETDIGESTLENGTH, JNI_R_BAD_ARGUMENT); goto end; } if (!(md = EVP_get_digestbyname(alg))) { - JNIerr(JNI_F_JAVA_GMSSL_GETDIGESTLENGTH, JNI_R_INVALID_DIGEST); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETDIGESTLENGTH, JNI_R_INVALID_DIGEST); goto end; } @@ -495,7 +495,7 @@ end: return ret; } -JNIEXPORT jint JNICALL Java_GmSSL_getDigestBlockSize( +JNIEXPORT jint JNICALL Java_org_gmssl_GmSSL_getDigestBlockSize( JNIEnv *env, jobject this, jstring algor) { jint ret = -1; @@ -503,12 +503,12 @@ JNIEXPORT jint JNICALL Java_GmSSL_getDigestBlockSize( const EVP_MD *md; if (!(alg = (*env)->GetStringUTFChars(env, algor, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_GETDIGESTBLOCKSIZE, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETDIGESTBLOCKSIZE, JNI_R_BAD_ARGUMENT); goto end; } if (!(md = EVP_get_digestbyname(alg))) { - JNIerr(JNI_F_JAVA_GMSSL_GETDIGESTBLOCKSIZE, JNI_R_INVALID_DIGEST); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETDIGESTBLOCKSIZE, JNI_R_INVALID_DIGEST); goto end; } @@ -519,7 +519,7 @@ end: return ret; } -JNIEXPORT jbyteArray JNICALL Java_GmSSL_digest(JNIEnv *env, jobject this, +JNIEXPORT jbyteArray JNICALL Java_org_gmssl_GmSSL_digest(JNIEnv *env, jobject this, jstring algor, jbyteArray in) { jbyteArray ret = NULL; @@ -531,29 +531,29 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_digest(JNIEnv *env, jobject this, const EVP_MD *md; if (!(alg = (*env)->GetStringUTFChars(env, algor, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_DIGEST, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DIGEST, JNI_R_BAD_ARGUMENT); goto end; } if (!(inbuf = (unsigned char *)(*env)->GetByteArrayElements(env, in, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_DIGEST, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DIGEST, JNI_R_BAD_ARGUMENT); goto end; } if ((inlen = (size_t)(*env)->GetArrayLength(env, in)) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_DIGEST, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DIGEST, JNI_R_BAD_ARGUMENT); goto end; } if (!(md = EVP_get_digestbyname(alg))) { - JNIerr(JNI_F_JAVA_GMSSL_DIGEST, JNI_R_INVALID_DIGEST); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DIGEST, JNI_R_INVALID_DIGEST); goto end; } if (!EVP_Digest(inbuf, inlen, outbuf, &outlen, md, NULL)) { - JNIerr(JNI_F_JAVA_GMSSL_DIGEST, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DIGEST, ERR_R_EVP_LIB); goto end; } if (!(ret = (*env)->NewByteArray(env, outlen))) { - JNIerr(JNI_F_JAVA_GMSSL_DIGEST, JNI_R_JNI_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DIGEST, JNI_R_JNI_MALLOC_FAILURE); goto end; } @@ -573,7 +573,7 @@ char *mac_algors[] = { "HMAC-SHA512", }; -JNIEXPORT jobjectArray JNICALL Java_GmSSL_getMacs( +JNIEXPORT jobjectArray JNICALL Java_org_gmssl_GmSSL_getMacs( JNIEnv *env, jobject this) { jobjectArray ret = NULL; @@ -583,7 +583,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getMacs( OSSL_NELEM(mac_algors), (*env)->FindClass(env, "java/lang/String"), (*env)->NewStringUTF(env, "")))) { - JNIerr(JNI_F_JAVA_GMSSL_GETMACS, JNI_R_JNI_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETMACS, JNI_R_JNI_MALLOC_FAILURE); return NULL; } @@ -595,7 +595,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getMacs( return ret; } -JNIEXPORT jbyteArray JNICALL Java_GmSSL_mac(JNIEnv *env, jobject this, +JNIEXPORT jbyteArray JNICALL Java_org_gmssl_GmSSL_mac(JNIEnv *env, jobject this, jstring algor, jbyteArray in, jbyteArray key) { jbyteArray ret = NULL; @@ -609,23 +609,23 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_mac(JNIEnv *env, jobject this, #endif if (!(alg = (*env)->GetStringUTFChars(env, algor, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_MAC, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_MAC, JNI_R_BAD_ARGUMENT); goto end; } if (!(inbuf = (unsigned char *)(*env)->GetByteArrayElements(env, in, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_MAC, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_MAC, JNI_R_BAD_ARGUMENT); goto end; } if ((inlen = (*env)->GetArrayLength(env, in)) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_MAC, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_MAC, JNI_R_BAD_ARGUMENT); goto end; } if (!(keybuf = (unsigned char *)(*env)->GetByteArrayElements(env, key, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_MAC, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_MAC, JNI_R_BAD_ARGUMENT); goto end; } if ((keylen = (*env)->GetArrayLength(env, key)) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_MAC, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_MAC, JNI_R_BAD_ARGUMENT); goto end; } @@ -634,12 +634,12 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_mac(JNIEnv *env, jobject this, unsigned int len = sizeof(outbuf); if (!(md = EVP_get_digestbyname(alg + strlen("HMAC-")))) { - JNIerr(JNI_F_JAVA_GMSSL_MAC, JNI_R_INVALID_DIGEST); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_MAC, JNI_R_INVALID_DIGEST); goto end; } if (!HMAC(md, keybuf, keylen, inbuf, inlen, outbuf, &len)) { - JNIerr(JNI_F_JAVA_GMSSL_MAC, JNI_R_HMAC_ERROR); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_MAC, JNI_R_HMAC_ERROR); goto end; } @@ -651,23 +651,23 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_mac(JNIEnv *env, jobject this, size_t len = sizeof(outbuf); if (!(cipher = EVP_get_cipherbyname(alg + strlen("CMAC-")))) { - JNIerr(JNI_F_JAVA_GMSSL_MAC, JNI_R_INVALID_CIPHER); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_MAC, JNI_R_INVALID_CIPHER); goto end; } if (!(cctx = CMAC_CTX_new())) { - JNIerr(JNI_F_JAVA_GMSSL_MAC, ERR_R_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_MAC, ERR_R_MALLOC_FAILURE); goto end; } if (!CMAC_Init(cctx, keybuf, keylen, cipher, NULL)) { - JNIerr(JNI_F_JAVA_GMSSL_MAC, JNI_R_CMAC_ERROR); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_MAC, JNI_R_CMAC_ERROR); goto end; } if (!CMAC_Update(cctx, inbuf, inlen)) { - JNIerr(JNI_F_JAVA_GMSSL_MAC, JNI_R_CMAC_ERROR); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_MAC, JNI_R_CMAC_ERROR); goto end; } if (!CMAC_Final(cctx, outbuf, &len)) { - JNIerr(JNI_F_JAVA_GMSSL_MAC, JNI_R_CMAC_ERROR); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_MAC, JNI_R_CMAC_ERROR); goto end; } @@ -678,7 +678,7 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_mac(JNIEnv *env, jobject this, } if (!(ret = (*env)->NewByteArray(env, outlen))) { - JNIerr(JNI_F_JAVA_GMSSL_MAC, JNI_R_JNI_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_MAC, JNI_R_JNI_MALLOC_FAILURE); goto end; } @@ -780,7 +780,7 @@ static int get_sign_info(const char *alg, int *ppkey_type, return 1; } -JNIEXPORT jobjectArray JNICALL Java_GmSSL_getSignAlgorithms( +JNIEXPORT jobjectArray JNICALL Java_org_gmssl_GmSSL_getSignAlgorithms( JNIEnv *env, jobject this) { jobjectArray ret = NULL; @@ -791,7 +791,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getSignAlgorithms( OSSL_NELEM(sign_nids), (*env)->FindClass(env, "java/lang/String"), (*env)->NewStringUTF(env, "")))) { - JNIerr(JNI_F_JAVA_GMSSL_GETSIGNALGORITHMS, JNI_R_JNI_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETSIGNALGORITHMS, JNI_R_JNI_MALLOC_FAILURE); return NULL; } @@ -803,7 +803,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getSignAlgorithms( return ret; } -JNIEXPORT jbyteArray JNICALL Java_GmSSL_sign(JNIEnv *env, jobject this, +JNIEXPORT jbyteArray JNICALL Java_org_gmssl_GmSSL_sign(JNIEnv *env, jobject this, jstring algor, jbyteArray in, jbyteArray key) { jbyteArray ret = NULL; @@ -821,55 +821,55 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_sign(JNIEnv *env, jobject this, EVP_PKEY_CTX *pkctx = NULL; if (!(alg = (*env)->GetStringUTFChars(env, algor, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_SIGN, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SIGN, JNI_R_BAD_ARGUMENT); goto end; } if (!(keybuf = (unsigned char *)(*env)->GetByteArrayElements(env, key, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_SIGN, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SIGN, JNI_R_BAD_ARGUMENT); goto end; } if ((keylen = (*env)->GetArrayLength(env, key)) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_SIGN, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SIGN, JNI_R_BAD_ARGUMENT); goto end; } if (!(inbuf = (unsigned char *)(*env)->GetByteArrayElements(env, in, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_SIGN, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SIGN, JNI_R_BAD_ARGUMENT); goto end; } if ((inlen = (*env)->GetArrayLength(env, in)) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_SIGN, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SIGN, JNI_R_BAD_ARGUMENT); goto end; } if (!get_sign_info(alg, &pkey_type, &md, &ec_scheme)) { - JNIerr(JNI_F_JAVA_GMSSL_SIGN, JNI_R_INVALID_SIGN_ALGOR); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SIGN, JNI_R_INVALID_SIGN_ALGOR); goto end; } cp = keybuf; if (!(pkey = d2i_PrivateKey(pkey_type, NULL, &cp, keylen))) { - JNIerr(JNI_F_JAVA_GMSSL_SIGN, JNI_R_INVALID_PRIVATE_KEY); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SIGN, JNI_R_INVALID_PRIVATE_KEY); goto end; } if (!(pkctx = EVP_PKEY_CTX_new(pkey, NULL))) { - JNIerr(JNI_F_JAVA_GMSSL_SIGN, ERR_R_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SIGN, ERR_R_MALLOC_FAILURE); goto end; } if (EVP_PKEY_sign_init(pkctx) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_SIGN, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SIGN, ERR_R_EVP_LIB); goto end; } if (md) { if (!EVP_PKEY_CTX_set_signature_md(pkctx, md)) { - JNIerr(JNI_F_JAVA_GMSSL_SIGN, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SIGN, ERR_R_EVP_LIB); goto end; } } if (pkey_type == EVP_PKEY_RSA) { #ifndef OPENSSL_NO_RSA if (!EVP_PKEY_CTX_set_rsa_padding(pkctx, RSA_PKCS1_PSS_PADDING)) { - JNIerr(JNI_F_JAVA_GMSSL_SIGN, ERR_R_RSA_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SIGN, ERR_R_RSA_LIB); goto end; } #endif @@ -877,19 +877,19 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_sign(JNIEnv *env, jobject this, #ifndef OPENSSL_NO_SM2 if (!EVP_PKEY_CTX_set_ec_scheme(pkctx, OBJ_txt2nid(alg) == NID_sm2sign ? NID_sm_scheme : NID_secg_scheme)) { - JNIerr(JNI_F_JAVA_GMSSL_SIGN, ERR_R_EC_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SIGN, ERR_R_EC_LIB); goto end; } #endif } if (EVP_PKEY_sign(pkctx, outbuf, &outlen, inbuf, inlen) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_SIGN, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SIGN, ERR_R_EVP_LIB); goto end; } if (!(ret = (*env)->NewByteArray(env, outlen))) { - JNIerr(JNI_F_JAVA_GMSSL_SIGN, JNI_R_JNI_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_SIGN, JNI_R_JNI_MALLOC_FAILURE); goto end; } @@ -904,7 +904,7 @@ end: return ret; } -JNIEXPORT jint JNICALL Java_GmSSL_verify(JNIEnv *env, jobject this, +JNIEXPORT jint JNICALL Java_org_gmssl_GmSSL_verify(JNIEnv *env, jobject this, jstring algor, jbyteArray in, jbyteArray sig, jbyteArray key) { jint ret = 0; @@ -921,61 +921,61 @@ JNIEXPORT jint JNICALL Java_GmSSL_verify(JNIEnv *env, jobject this, EVP_PKEY_CTX *pkctx = NULL; if (!(alg = (*env)->GetStringUTFChars(env, algor, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_VERIFY, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_VERIFY, JNI_R_BAD_ARGUMENT); goto end; } if (!(inbuf = (unsigned char *)(*env)->GetByteArrayElements(env, in, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_VERIFY, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_VERIFY, JNI_R_BAD_ARGUMENT); goto end; } if ((inlen = (*env)->GetArrayLength(env, in)) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_VERIFY, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_VERIFY, JNI_R_BAD_ARGUMENT); goto end; } if (!(sigbuf = (unsigned char *)(*env)->GetByteArrayElements(env, sig, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_VERIFY, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_VERIFY, JNI_R_BAD_ARGUMENT); goto end; } if ((siglen = (*env)->GetArrayLength(env, sig)) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_VERIFY, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_VERIFY, JNI_R_BAD_ARGUMENT); goto end; } if (!(keybuf = (unsigned char *)(*env)->GetByteArrayElements(env, key, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_VERIFY, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_VERIFY, JNI_R_BAD_ARGUMENT); goto end; } if ((keylen = (*env)->GetArrayLength(env, key)) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_VERIFY, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_VERIFY, JNI_R_BAD_ARGUMENT); goto end; } if (!get_sign_info(alg, &pkey_type, &md, &ec_scheme)) { - JNIerr(JNI_F_JAVA_GMSSL_VERIFY, JNI_R_INVALID_SIGN_ALGOR); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_VERIFY, JNI_R_INVALID_SIGN_ALGOR); goto end; } cp = keybuf; if (!(pkey = d2i_PUBKEY(NULL, &cp, (long)keylen))) { - JNIerr(JNI_F_JAVA_GMSSL_VERIFY, JNI_R_INVALID_PUBLIC_KEY); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_VERIFY, JNI_R_INVALID_PUBLIC_KEY); goto end; } if (EVP_PKEY_id(pkey) != pkey_type) { - JNIerr(JNI_F_JAVA_GMSSL_VERIFY, JNI_R_INVALID_PUBLIC_KEY); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_VERIFY, JNI_R_INVALID_PUBLIC_KEY); goto end; } if (!(pkctx = EVP_PKEY_CTX_new(pkey, NULL))) { - JNIerr(JNI_F_JAVA_GMSSL_VERIFY, ERR_R_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_VERIFY, ERR_R_MALLOC_FAILURE); goto end; } if (EVP_PKEY_verify_init(pkctx) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_VERIFY, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_VERIFY, ERR_R_EVP_LIB); goto end; } if (md && !EVP_PKEY_CTX_set_signature_md(pkctx, md)) { - JNIerr(JNI_F_JAVA_GMSSL_VERIFY, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_VERIFY, ERR_R_EVP_LIB); goto end; } @@ -983,7 +983,7 @@ JNIEXPORT jint JNICALL Java_GmSSL_verify(JNIEnv *env, jobject this, if (pkey_type == EVP_PKEY_RSA) { #ifndef OPENSSL_NO_RSA if (!EVP_PKEY_CTX_set_rsa_padding(pkctx, RSA_PKCS1_PSS_PADDING)) { - JNIerr(JNI_F_JAVA_GMSSL_VERIFY, ERR_R_RSA_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_VERIFY, ERR_R_RSA_LIB); goto end; } #endif @@ -991,14 +991,14 @@ JNIEXPORT jint JNICALL Java_GmSSL_verify(JNIEnv *env, jobject this, #ifndef OPENSSL_NO_SM2 if (!EVP_PKEY_CTX_set_ec_scheme(pkctx, OBJ_txt2nid(alg) == NID_sm2sign ? NID_sm_scheme : NID_secg_scheme)) { - JNIerr(JNI_F_JAVA_GMSSL_VERIFY, ERR_R_EC_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_VERIFY, ERR_R_EC_LIB); goto end; } #endif } if (EVP_PKEY_verify(pkctx, sigbuf, siglen, inbuf, inlen) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_VERIFY, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_VERIFY, ERR_R_EVP_LIB); goto end; } @@ -1125,7 +1125,7 @@ static int get_pke_info(const char *alg, int *ppkey_type, return 1; } -JNIEXPORT jobjectArray JNICALL Java_GmSSL_getPublicKeyEncryptions( +JNIEXPORT jobjectArray JNICALL Java_org_gmssl_GmSSL_getPublicKeyEncryptions( JNIEnv *env, jobject this) { jobjectArray ret = NULL; @@ -1135,7 +1135,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getPublicKeyEncryptions( OSSL_NELEM(pke_nids), (*env)->FindClass(env, "java/lang/String"), (*env)->NewStringUTF(env, "")))) { - JNIerr(JNI_F_JAVA_GMSSL_GETPUBLICKEYENCRYPTIONS, JNI_R_JNI_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETPUBLICKEYENCRYPTIONS, JNI_R_JNI_MALLOC_FAILURE); return NULL; } @@ -1147,7 +1147,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getPublicKeyEncryptions( return ret; } -JNIEXPORT jbyteArray JNICALL Java_GmSSL_publicKeyEncrypt( +JNIEXPORT jbyteArray JNICALL Java_org_gmssl_GmSSL_publicKeyEncrypt( JNIEnv *env, jobject this, jstring algor, jbyteArray in, jbyteArray key) { @@ -1167,79 +1167,79 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_publicKeyEncrypt( if (!(alg = (*env)->GetStringUTFChars(env, algor, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYENCRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYENCRYPT, JNI_R_BAD_ARGUMENT); goto end; } if (!(inbuf = (unsigned char *)(*env)->GetByteArrayElements(env, in, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYENCRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYENCRYPT, JNI_R_BAD_ARGUMENT); goto end; } if ((inlen = (*env)->GetArrayLength(env, in)) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYENCRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYENCRYPT, JNI_R_BAD_ARGUMENT); goto end; } if ((inlen = (*env)->GetArrayLength(env, in)) > 256) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYENCRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYENCRYPT, JNI_R_BAD_ARGUMENT); goto end; } if (!(keybuf = (unsigned char *)(*env)->GetByteArrayElements(env, key, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYENCRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYENCRYPT, JNI_R_BAD_ARGUMENT); goto end; } if ((keylen = (*env)->GetArrayLength(env, key)) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYENCRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYENCRYPT, JNI_R_BAD_ARGUMENT); goto end; } cp = keybuf; outlen = inlen + 1024; if (!get_pke_info(alg, &pkey_type, &ec_scheme, &ec_encrypt_param)) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYENCRYPT, JNI_R_INVALID_PUBLIC_KEY_ENCRYPTION_ALGOR); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYENCRYPT, JNI_R_INVALID_PUBLIC_KEY_ENCRYPTION_ALGOR); goto end; } if (!(outbuf = OPENSSL_malloc(outlen))) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYENCRYPT, ERR_R_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYENCRYPT, ERR_R_MALLOC_FAILURE); goto end; } if (!(pkey = d2i_PUBKEY(NULL, &cp, (long)keylen))) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYENCRYPT, JNI_R_INVALID_PUBLIC_KEY); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYENCRYPT, JNI_R_INVALID_PUBLIC_KEY); goto end; } if (EVP_PKEY_id(pkey) != pkey_type) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYENCRYPT, JNI_R_INVALID_PUBLIC_KEY); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYENCRYPT, JNI_R_INVALID_PUBLIC_KEY); goto end; } if (!(pkctx = EVP_PKEY_CTX_new(pkey, NULL))) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYENCRYPT, ERR_R_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYENCRYPT, ERR_R_MALLOC_FAILURE); goto end; } if (EVP_PKEY_encrypt_init(pkctx) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYENCRYPT, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYENCRYPT, ERR_R_EVP_LIB); goto end; } if (pkey_type == EVP_PKEY_EC) { #if !defined(OPENSSL_NO_ECIES) || !defined(OPENSSL_NO_SM2) if (!EVP_PKEY_CTX_set_ec_scheme(pkctx, ec_scheme)) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYENCRYPT, ERR_R_EC_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYENCRYPT, ERR_R_EC_LIB); goto end; } if (!EVP_PKEY_CTX_set_ec_encrypt_param(pkctx, ec_encrypt_param)) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYENCRYPT, ERR_R_EC_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYENCRYPT, ERR_R_EC_LIB); goto end; } #endif } if (EVP_PKEY_encrypt(pkctx, outbuf, &outlen, inbuf, inlen) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYENCRYPT, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYENCRYPT, ERR_R_EVP_LIB); goto end; } if (!(ret = (*env)->NewByteArray(env, outlen))) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYENCRYPT, JNI_R_JNI_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYENCRYPT, JNI_R_JNI_MALLOC_FAILURE); goto end; } @@ -1263,7 +1263,7 @@ static int gmssl_pkey_encrypt(const char *algor, const unsigned char *in, size_t } */ -JNIEXPORT jbyteArray JNICALL Java_GmSSL_publicKeyDecrypt( +JNIEXPORT jbyteArray JNICALL Java_org_gmssl_GmSSL_publicKeyDecrypt( JNIEnv *env, jobject this, jstring algor, jbyteArray in, jbyteArray key) { @@ -1282,23 +1282,23 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_publicKeyDecrypt( EVP_PKEY_CTX *pkctx = NULL; if (!(alg = (*env)->GetStringUTFChars(env, algor, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYDECRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYDECRYPT, JNI_R_BAD_ARGUMENT); goto end; } if (!(inbuf = (unsigned char *)(*env)->GetByteArrayElements(env, in, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYDECRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYDECRYPT, JNI_R_BAD_ARGUMENT); goto end; } if ((inlen = (*env)->GetArrayLength(env, in)) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYDECRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYDECRYPT, JNI_R_BAD_ARGUMENT); goto end; } if (!(keybuf = (unsigned char *)(*env)->GetByteArrayElements(env, key, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYDECRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYDECRYPT, JNI_R_BAD_ARGUMENT); goto end; } if ((keylen = (*env)->GetArrayLength(env, key)) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYDECRYPT, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYDECRYPT, JNI_R_BAD_ARGUMENT); goto end; } cp = keybuf; @@ -1306,48 +1306,48 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_publicKeyDecrypt( if(!get_pke_info(alg, &pkey_type, &ec_scheme, &ec_encrypt_param)) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYDECRYPT, JNI_R_INVALID_PUBLIC_KEY_ENCRYPTION_ALGOR); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYDECRYPT, JNI_R_INVALID_PUBLIC_KEY_ENCRYPTION_ALGOR); goto end; } if (!(outbuf = OPENSSL_malloc(outlen))) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYDECRYPT, ERR_R_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYDECRYPT, ERR_R_MALLOC_FAILURE); goto end; } if (!(pkey = d2i_PrivateKey(pkey_type, NULL, &cp, (long)keylen))) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYDECRYPT, JNI_R_INVALID_PRIVATE_KEY); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYDECRYPT, JNI_R_INVALID_PRIVATE_KEY); goto end; } if (!(pkctx = EVP_PKEY_CTX_new(pkey, NULL))) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYDECRYPT, ERR_R_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYDECRYPT, ERR_R_MALLOC_FAILURE); goto end; } if (EVP_PKEY_decrypt_init(pkctx) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYDECRYPT, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYDECRYPT, ERR_R_EVP_LIB); goto end; } if (pkey_type == EVP_PKEY_EC) { #if !defined(OPENSSL_NO_ECIES) || !defined(OPENSSL_NO_SM2) if (!EVP_PKEY_CTX_set_ec_scheme(pkctx, ec_scheme)) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYDECRYPT, ERR_R_EC_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYDECRYPT, ERR_R_EC_LIB); goto end; } if (!EVP_PKEY_CTX_set_ec_encrypt_param(pkctx, ec_encrypt_param)) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYDECRYPT, ERR_R_EC_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYDECRYPT, ERR_R_EC_LIB); goto end; } #endif } if (EVP_PKEY_decrypt(pkctx, outbuf, &outlen, inbuf, inlen) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYDECRYPT, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYDECRYPT, ERR_R_EVP_LIB); goto end; } if (!(ret = (*env)->NewByteArray(env, outlen))) { - JNIerr(JNI_F_JAVA_GMSSL_PUBLICKEYDECRYPT, JNI_R_JNI_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYDECRYPT, JNI_R_JNI_MALLOC_FAILURE); goto end; } @@ -1488,7 +1488,7 @@ static int get_exch_info(const char *alg, int *ppkey_type, int *pec_scheme, return 1; } -JNIEXPORT jobjectArray JNICALL Java_GmSSL_getDeriveKeyAlgorithms( +JNIEXPORT jobjectArray JNICALL Java_org_gmssl_GmSSL_getDeriveKeyAlgorithms( JNIEnv *env, jobject this) { jobjectArray ret = NULL; @@ -1498,7 +1498,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getDeriveKeyAlgorithms( OSSL_NELEM(exch_nids), (*env)->FindClass(env, "java/lang/String"), (*env)->NewStringUTF(env, "")))) { - JNIerr(JNI_F_JAVA_GMSSL_GETDERIVEKEYALGORITHMS, JNI_R_JNI_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETDERIVEKEYALGORITHMS, JNI_R_JNI_MALLOC_FAILURE); return NULL; } @@ -1510,7 +1510,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getDeriveKeyAlgorithms( return ret; } -JNIEXPORT jbyteArray JNICALL Java_GmSSL_deriveKey( +JNIEXPORT jbyteArray JNICALL Java_org_gmssl_GmSSL_deriveKey( JNIEnv *env, jobject this, jstring algor, jint outkeylen, jbyteArray peerkey, jbyteArray key) { @@ -1537,27 +1537,27 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_deriveKey( if (!(alg = (*env)->GetStringUTFChars(env, algor, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, JNI_R_BAD_ARGUMENT); goto end; } if ((outkeylen <= 0 || outkeylen > sizeof(outbuf))) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, JNI_R_BAD_ARGUMENT); goto end; } if (!(inbuf = (unsigned char *)(*env)->GetByteArrayElements(env, peerkey, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, JNI_R_BAD_ARGUMENT); goto end; } if ((inlen = (*env)->GetArrayLength(env, peerkey)) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, JNI_R_BAD_ARGUMENT); goto end; } if (!(keybuf = (unsigned char *)(*env)->GetByteArrayElements(env, key, 0))) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, JNI_R_BAD_ARGUMENT); goto end; } if ((keylen = (*env)->GetArrayLength(env, key)) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, JNI_R_BAD_ARGUMENT); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, JNI_R_BAD_ARGUMENT); goto end; } cpin = inbuf; @@ -1565,73 +1565,73 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_deriveKey( if (!get_exch_info(alg, &pkey_type, &ec_scheme, &ecdh_cofactor_mode, &ecdh_kdf_type, &ecdh_kdf_md, &ecdh_kdf_outlen, &ecdh_kdf_ukm, &ecdh_kdf_ukm_len)) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, JNI_R_INVALID_DERIVE_KEY_ALGOR); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, JNI_R_INVALID_DERIVE_KEY_ALGOR); goto end; } if (!(peerpkey = d2i_PUBKEY(NULL, &cpin, (long)inlen))) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, JNI_R_INVALID_PUBLIC_KEY); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, JNI_R_INVALID_PUBLIC_KEY); goto end; } if (EVP_PKEY_id(peerpkey) != pkey_type) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, JNI_R_INVALID_PUBLIC_KEY); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, JNI_R_INVALID_PUBLIC_KEY); goto end; } if (!(pkey = d2i_PrivateKey(pkey_type, NULL, &cpkey, (long)keylen))) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, JNI_R_INVALID_PRIVATE_KEY); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, JNI_R_INVALID_PRIVATE_KEY); goto end; } if (!(pkctx = EVP_PKEY_CTX_new(pkey, NULL))) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, ERR_R_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, ERR_R_MALLOC_FAILURE); goto end; } if (EVP_PKEY_derive_init(pkctx) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, ERR_R_EVP_LIB); goto end; } if (pkey_type == EVP_PKEY_EC) { if (!EVP_PKEY_CTX_set_ec_scheme(pkctx, ec_scheme)) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, ERR_R_EC_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, ERR_R_EC_LIB); goto end; } } if (ec_scheme == NID_secg_scheme) { if (!EVP_PKEY_CTX_set_ecdh_cofactor_mode(pkctx, ecdh_cofactor_mode)) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, ERR_R_EC_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, ERR_R_EC_LIB); goto end; } if (!EVP_PKEY_CTX_set_ecdh_kdf_type(pkctx, ecdh_kdf_type)) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, ERR_R_EC_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, ERR_R_EC_LIB); goto end; } if (!EVP_PKEY_CTX_set_ecdh_kdf_md(pkctx, EVP_get_digestbynid(ecdh_kdf_md))) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, ERR_R_EC_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, ERR_R_EC_LIB); goto end; } if (!EVP_PKEY_CTX_set_ecdh_kdf_outlen(pkctx, ecdh_kdf_outlen)) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, ERR_R_EC_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, ERR_R_EC_LIB); goto end; } if (!EVP_PKEY_CTX_set0_ecdh_kdf_ukm(pkctx, ecdh_kdf_ukm, ecdh_kdf_ukm_len)) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, ERR_R_EC_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, ERR_R_EC_LIB); goto end; } } else if (ec_scheme == NID_sm_scheme) { } if (EVP_PKEY_derive_set_peer(pkctx, peerpkey) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, ERR_R_EVP_LIB); goto end; } if (EVP_PKEY_derive(pkctx, outbuf, &outlen) <= 0) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, ERR_R_EVP_LIB); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, ERR_R_EVP_LIB); goto end; } if (!(ret = (*env)->NewByteArray(env, outlen))) { - JNIerr(JNI_F_JAVA_GMSSL_DERIVEKEY, JNI_R_JNI_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY, JNI_R_JNI_MALLOC_FAILURE); goto end; } @@ -1670,14 +1670,14 @@ static void free_errstr(char *s) OPENSSL_free(s); } -JNIEXPORT jobjectArray JNICALL Java_GmSSL_getErrorStrings(JNIEnv *env, jobject this) +JNIEXPORT jobjectArray JNICALL Java_org_gmssl_GmSSL_getErrorStrings(JNIEnv *env, jobject this) { jobjectArray ret = NULL; STACK_OF(OPENSSL_STRING) *sk = NULL; int i; if (!(sk = sk_OPENSSL_STRING_new_null())) { - JNIerr(JNI_F_JAVA_GMSSL_GETERRORSTRINGS, ERR_R_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETERRORSTRINGS, ERR_R_MALLOC_FAILURE); goto end; } @@ -1687,7 +1687,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getErrorStrings(JNIEnv *env, jobject t sk_OPENSSL_STRING_num(sk), (*env)->FindClass(env, "java/lang/String"), (*env)->NewStringUTF(env, "")))) { - JNIerr(JNI_F_JAVA_GMSSL_GETERRORSTRINGS, JNI_R_JNI_MALLOC_FAILURE); + JNIerr(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETERRORSTRINGS, JNI_R_JNI_MALLOC_FAILURE); return NULL; } diff --git a/java/GmSSL.h b/java/GmSSL.h index 5cb115a3..19f24926 100644 --- a/java/GmSSL.h +++ b/java/GmSSL.h @@ -12,7 +12,7 @@ extern "C" { * Method: getVersions * Signature: ()[Ljava/lang/String; */ -JNIEXPORT jobjectArray JNICALL Java_GmSSL_getVersions +JNIEXPORT jobjectArray JNICALL Java_org_gmssl_GmSSL_getVersions (JNIEnv *, jobject); /* @@ -20,7 +20,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getVersions * Method: getCiphers * Signature: ()[Ljava/lang/String; */ -JNIEXPORT jobjectArray JNICALL Java_GmSSL_getCiphers +JNIEXPORT jobjectArray JNICALL Java_org_gmssl_GmSSL_getCiphers (JNIEnv *, jobject); /* @@ -28,7 +28,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getCiphers * Method: getDigests * Signature: ()[Ljava/lang/String; */ -JNIEXPORT jobjectArray JNICALL Java_GmSSL_getDigests +JNIEXPORT jobjectArray JNICALL Java_org_gmssl_GmSSL_getDigests (JNIEnv *, jobject); /* @@ -36,7 +36,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getDigests * Method: getMacs * Signature: ()[Ljava/lang/String; */ -JNIEXPORT jobjectArray JNICALL Java_GmSSL_getMacs +JNIEXPORT jobjectArray JNICALL Java_org_gmssl_GmSSL_getMacs (JNIEnv *, jobject); /* @@ -44,7 +44,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getMacs * Method: getSignAlgorithms * Signature: ()[Ljava/lang/String; */ -JNIEXPORT jobjectArray JNICALL Java_GmSSL_getSignAlgorithms +JNIEXPORT jobjectArray JNICALL Java_org_gmssl_GmSSL_getSignAlgorithms (JNIEnv *, jobject); /* @@ -52,7 +52,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getSignAlgorithms * Method: getPublicKeyEncryptions * Signature: ()[Ljava/lang/String; */ -JNIEXPORT jobjectArray JNICALL Java_GmSSL_getPublicKeyEncryptions +JNIEXPORT jobjectArray JNICALL Java_org_gmssl_GmSSL_getPublicKeyEncryptions (JNIEnv *, jobject); /* @@ -60,7 +60,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getPublicKeyEncryptions * Method: getDeriveKeyAlgorithms * Signature: ()[Ljava/lang/String; */ -JNIEXPORT jobjectArray JNICALL Java_GmSSL_getDeriveKeyAlgorithms +JNIEXPORT jobjectArray JNICALL Java_org_gmssl_GmSSL_getDeriveKeyAlgorithms (JNIEnv *, jobject); /* @@ -68,7 +68,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getDeriveKeyAlgorithms * Method: generateRandom * Signature: (I)[B */ -JNIEXPORT jbyteArray JNICALL Java_GmSSL_generateRandom +JNIEXPORT jbyteArray JNICALL Java_org_gmssl_GmSSL_generateRandom (JNIEnv *, jobject, jint); /* @@ -76,7 +76,7 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_generateRandom * Method: getCipherIVLength * Signature: (Ljava/lang/String;)I */ -JNIEXPORT jint JNICALL Java_GmSSL_getCipherIVLength +JNIEXPORT jint JNICALL Java_org_gmssl_GmSSL_getCipherIVLength (JNIEnv *, jobject, jstring); /* @@ -84,7 +84,7 @@ JNIEXPORT jint JNICALL Java_GmSSL_getCipherIVLength * Method: getCipherKeyLength * Signature: (Ljava/lang/String;)I */ -JNIEXPORT jint JNICALL Java_GmSSL_getCipherKeyLength +JNIEXPORT jint JNICALL Java_org_gmssl_GmSSL_getCipherKeyLength (JNIEnv *, jobject, jstring); /* @@ -92,7 +92,7 @@ JNIEXPORT jint JNICALL Java_GmSSL_getCipherKeyLength * Method: getCipherBlockSize * Signature: (Ljava/lang/String;)I */ -JNIEXPORT jint JNICALL Java_GmSSL_getCipherBlockSize +JNIEXPORT jint JNICALL Java_org_gmssl_GmSSL_getCipherBlockSize (JNIEnv *, jobject, jstring); /* @@ -100,7 +100,7 @@ JNIEXPORT jint JNICALL Java_GmSSL_getCipherBlockSize * Method: symmetricEncrypt * Signature: (Ljava/lang/String;[B[B[B)[B */ -JNIEXPORT jbyteArray JNICALL Java_GmSSL_symmetricEncrypt +JNIEXPORT jbyteArray JNICALL Java_org_gmssl_GmSSL_symmetricEncrypt (JNIEnv *, jobject, jstring, jbyteArray, jbyteArray, jbyteArray); /* @@ -108,7 +108,7 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_symmetricEncrypt * Method: symmetricDecrypt * Signature: (Ljava/lang/String;[B[B[B)[B */ -JNIEXPORT jbyteArray JNICALL Java_GmSSL_symmetricDecrypt +JNIEXPORT jbyteArray JNICALL Java_org_gmssl_GmSSL_symmetricDecrypt (JNIEnv *, jobject, jstring, jbyteArray, jbyteArray, jbyteArray); /* @@ -116,7 +116,7 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_symmetricDecrypt * Method: getDigestLength * Signature: (Ljava/lang/String;)I */ -JNIEXPORT jint JNICALL Java_GmSSL_getDigestLength +JNIEXPORT jint JNICALL Java_org_gmssl_GmSSL_getDigestLength (JNIEnv *, jobject, jstring); /* @@ -124,7 +124,7 @@ JNIEXPORT jint JNICALL Java_GmSSL_getDigestLength * Method: getDigestBlockSize * Signature: (Ljava/lang/String;)I */ -JNIEXPORT jint JNICALL Java_GmSSL_getDigestBlockSize +JNIEXPORT jint JNICALL Java_org_gmssl_GmSSL_getDigestBlockSize (JNIEnv *, jobject, jstring); /* @@ -132,7 +132,7 @@ JNIEXPORT jint JNICALL Java_GmSSL_getDigestBlockSize * Method: digest * Signature: (Ljava/lang/String;[B)[B */ -JNIEXPORT jbyteArray JNICALL Java_GmSSL_digest +JNIEXPORT jbyteArray JNICALL Java_org_gmssl_GmSSL_digest (JNIEnv *, jobject, jstring, jbyteArray); /* @@ -140,7 +140,7 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_digest * Method: getMacLength * Signature: (Ljava/lang/String;)[Ljava/lang/String; */ -JNIEXPORT jobjectArray JNICALL Java_GmSSL_getMacLength +JNIEXPORT jobjectArray JNICALL Java_org_gmssl_GmSSL_getMacLength (JNIEnv *, jobject, jstring); /* @@ -148,7 +148,7 @@ JNIEXPORT jobjectArray JNICALL Java_GmSSL_getMacLength * Method: mac * Signature: (Ljava/lang/String;[B[B)[B */ -JNIEXPORT jbyteArray JNICALL Java_GmSSL_mac +JNIEXPORT jbyteArray JNICALL Java_org_gmssl_GmSSL_mac (JNIEnv *, jobject, jstring, jbyteArray, jbyteArray); /* @@ -156,7 +156,7 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_mac * Method: sign * Signature: (Ljava/lang/String;[B[B)[B */ -JNIEXPORT jbyteArray JNICALL Java_GmSSL_sign +JNIEXPORT jbyteArray JNICALL Java_org_gmssl_GmSSL_sign (JNIEnv *, jobject, jstring, jbyteArray, jbyteArray); /* @@ -164,7 +164,7 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_sign * Method: verify * Signature: (Ljava/lang/String;[B[B[B)I */ -JNIEXPORT jint JNICALL Java_GmSSL_verify +JNIEXPORT jint JNICALL Java_org_gmssl_GmSSL_verify (JNIEnv *, jobject, jstring, jbyteArray, jbyteArray, jbyteArray); /* @@ -172,7 +172,7 @@ JNIEXPORT jint JNICALL Java_GmSSL_verify * Method: publicKeyEncrypt * Signature: (Ljava/lang/String;[B[B)[B */ -JNIEXPORT jbyteArray JNICALL Java_GmSSL_publicKeyEncrypt +JNIEXPORT jbyteArray JNICALL Java_org_gmssl_GmSSL_publicKeyEncrypt (JNIEnv *, jobject, jstring, jbyteArray, jbyteArray); /* @@ -180,7 +180,7 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_publicKeyEncrypt * Method: publicKeyDecrypt * Signature: (Ljava/lang/String;[B[B)[B */ -JNIEXPORT jbyteArray JNICALL Java_GmSSL_publicKeyDecrypt +JNIEXPORT jbyteArray JNICALL Java_org_gmssl_GmSSL_publicKeyDecrypt (JNIEnv *, jobject, jstring, jbyteArray, jbyteArray); /* @@ -188,7 +188,7 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_publicKeyDecrypt * Method: deriveKey * Signature: (Ljava/lang/String;I[B[B)[B */ -JNIEXPORT jbyteArray JNICALL Java_GmSSL_deriveKey +JNIEXPORT jbyteArray JNICALL Java_org_gmssl_GmSSL_deriveKey (JNIEnv *, jobject, jstring, jint, jbyteArray, jbyteArray); /* @@ -196,7 +196,7 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_deriveKey * Method: getErrorStrings * Signature: ()[Ljava/lang/String; */ -JNIEXPORT jobjectArray JNICALL Java_GmSSL_getErrorStrings +JNIEXPORT jobjectArray JNICALL Java_org_gmssl_GmSSL_getErrorStrings (JNIEnv *, jobject); #ifdef __cplusplus diff --git a/java/GmSSL.java b/java/GmSSL.java index 0175f1cb..5d4708b0 100755 --- a/java/GmSSL.java +++ b/java/GmSSL.java @@ -46,6 +46,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. * ==================================================================== */ +package org.gmssl; public class GmSSL { diff --git a/java/gmssl_err.c b/java/gmssl_err.c index 48546000..c9e9f261 100644 --- a/java/gmssl_err.c +++ b/java/gmssl_err.c @@ -19,42 +19,42 @@ # define ERR_REASON(reason) ERR_PACK(0,0,reason) static ERR_STRING_DATA JNI_str_functs[] = { - {ERR_FUNC(JNI_F_JAVA_GMSSL_DERIVEKEY), "Java_GmSSL_deriveKey"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_DIGEST), "Java_GmSSL_digest"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_GENERATERANDOM), "Java_GmSSL_generateRandom"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_GETCIPHERBLOCKSIZE), - "Java_GmSSL_getCipherBlockSize"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_GETCIPHERIVLENGTH), - "Java_GmSSL_getCipherIVLength"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_GETCIPHERKEYLENGTH), - "Java_GmSSL_getCipherKeyLength"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_GETCIPHERS), "Java_GmSSL_getCiphers"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_GETDERIVEKEYALGORITHMS), - "Java_GmSSL_getDeriveKeyAlgorithms"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_GETDIGESTBLOCKSIZE), - "Java_GmSSL_getDigestBlockSize"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_GETDIGESTLENGTH), - "Java_GmSSL_getDigestLength"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_GETDIGESTS), "Java_GmSSL_getDigests"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_GETERRORSTRINGS), - "Java_GmSSL_getErrorStrings"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_GETMACS), "Java_GmSSL_getMacs"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_GETPUBLICKEYENCRYPTIONS), - "Java_GmSSL_getPublicKeyEncryptions"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_GETSIGNALGORITHMS), - "Java_GmSSL_getSignAlgorithms"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_GETVERSIONS), "Java_GmSSL_getVersions"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_MAC), "Java_GmSSL_mac"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_PUBLICKEYDECRYPT), - "Java_GmSSL_publicKeyDecrypt"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_PUBLICKEYENCRYPT), - "Java_GmSSL_publicKeyEncrypt"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_SIGN), "Java_GmSSL_sign"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_SYMMETRICDECRYPT), - "Java_GmSSL_symmetricDecrypt"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_SYMMETRICENCRYPT), - "Java_GmSSL_symmetricEncrypt"}, - {ERR_FUNC(JNI_F_JAVA_GMSSL_VERIFY), "Java_GmSSL_verify"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY), "Java_org_gmssl_GmSSL_deriveKey"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_DIGEST), "Java_org_gmssl_GmSSL_digest"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_GENERATERANDOM), "Java_org_gmssl_GmSSL_generateRandom"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETCIPHERBLOCKSIZE), + "Java_org_gmssl_GmSSL_getCipherBlockSize"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETCIPHERIVLENGTH), + "Java_org_gmssl_GmSSL_getCipherIVLength"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETCIPHERKEYLENGTH), + "Java_org_gmssl_GmSSL_getCipherKeyLength"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETCIPHERS), "Java_org_gmssl_GmSSL_getCiphers"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETDERIVEKEYALGORITHMS), + "Java_org_gmssl_GmSSL_getDeriveKeyAlgorithms"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETDIGESTBLOCKSIZE), + "Java_org_gmssl_GmSSL_getDigestBlockSize"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETDIGESTLENGTH), + "Java_org_gmssl_GmSSL_getDigestLength"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETDIGESTS), "Java_org_gmssl_GmSSL_getDigests"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETERRORSTRINGS), + "Java_org_gmssl_GmSSL_getErrorStrings"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETMACS), "Java_org_gmssl_GmSSL_getMacs"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETPUBLICKEYENCRYPTIONS), + "Java_org_gmssl_GmSSL_getPublicKeyEncryptions"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETSIGNALGORITHMS), + "Java_org_gmssl_GmSSL_getSignAlgorithms"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_GETVERSIONS), "Java_org_gmssl_GmSSL_getVersions"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_MAC), "Java_org_gmssl_GmSSL_mac"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYDECRYPT), + "Java_org_gmssl_GmSSL_publicKeyDecrypt"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYENCRYPT), + "Java_org_gmssl_GmSSL_publicKeyEncrypt"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_SIGN), "Java_org_gmssl_GmSSL_sign"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICDECRYPT), + "Java_org_gmssl_GmSSL_symmetricDecrypt"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICENCRYPT), + "Java_org_gmssl_GmSSL_symmetricEncrypt"}, + {ERR_FUNC(JNI_F_JAVA_ORG_GMSSL_GMSSL_VERIFY), "Java_org_gmssl_GmSSL_verify"}, {ERR_FUNC(JNI_F_PRINT_ERRORS_CB), "print_errors_cb"}, {0, NULL} }; diff --git a/java/gmssl_err.h b/java/gmssl_err.h index c107f5e2..1e7e60cf 100644 --- a/java/gmssl_err.h +++ b/java/gmssl_err.h @@ -19,29 +19,29 @@ static void ERR_JNI_error(int function, int reason, char *file, int line); /* Error codes for the JNI functions. */ /* Function codes. */ -# define JNI_F_JAVA_GMSSL_DERIVEKEY 100 -# define JNI_F_JAVA_GMSSL_DIGEST 101 -# define JNI_F_JAVA_GMSSL_GENERATERANDOM 102 -# define JNI_F_JAVA_GMSSL_GETCIPHERBLOCKSIZE 103 -# define JNI_F_JAVA_GMSSL_GETCIPHERIVLENGTH 104 -# define JNI_F_JAVA_GMSSL_GETCIPHERKEYLENGTH 105 -# define JNI_F_JAVA_GMSSL_GETCIPHERS 106 -# define JNI_F_JAVA_GMSSL_GETDERIVEKEYALGORITHMS 107 -# define JNI_F_JAVA_GMSSL_GETDIGESTBLOCKSIZE 108 -# define JNI_F_JAVA_GMSSL_GETDIGESTLENGTH 109 -# define JNI_F_JAVA_GMSSL_GETDIGESTS 110 -# define JNI_F_JAVA_GMSSL_GETERRORSTRINGS 111 -# define JNI_F_JAVA_GMSSL_GETMACS 112 -# define JNI_F_JAVA_GMSSL_GETPUBLICKEYENCRYPTIONS 113 -# define JNI_F_JAVA_GMSSL_GETSIGNALGORITHMS 114 -# define JNI_F_JAVA_GMSSL_GETVERSIONS 115 -# define JNI_F_JAVA_GMSSL_MAC 116 -# define JNI_F_JAVA_GMSSL_PUBLICKEYDECRYPT 117 -# define JNI_F_JAVA_GMSSL_PUBLICKEYENCRYPT 118 -# define JNI_F_JAVA_GMSSL_SIGN 119 -# define JNI_F_JAVA_GMSSL_SYMMETRICDECRYPT 120 -# define JNI_F_JAVA_GMSSL_SYMMETRICENCRYPT 121 -# define JNI_F_JAVA_GMSSL_VERIFY 122 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_DERIVEKEY 100 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_DIGEST 101 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_GENERATERANDOM 102 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_GETCIPHERBLOCKSIZE 103 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_GETCIPHERIVLENGTH 104 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_GETCIPHERKEYLENGTH 105 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_GETCIPHERS 106 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_GETDERIVEKEYALGORITHMS 107 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_GETDIGESTBLOCKSIZE 108 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_GETDIGESTLENGTH 109 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_GETDIGESTS 110 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_GETERRORSTRINGS 111 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_GETMACS 112 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_GETPUBLICKEYENCRYPTIONS 113 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_GETSIGNALGORITHMS 114 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_GETVERSIONS 115 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_MAC 116 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYDECRYPT 117 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_PUBLICKEYENCRYPT 118 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_SIGN 119 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICDECRYPT 120 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_SYMMETRICENCRYPT 121 +# define JNI_F_JAVA_ORG_GMSSL_GMSSL_VERIFY 122 # define JNI_F_PRINT_ERRORS_CB 123 /* Reason codes. */