abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-05-07 08:56:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #922 from nnabuuu/java_wrapper_fix

Browse Source 
[bugFix] Fix java wrapper import issue by adding package name org.gmssl
This commit is contained in:
Zhi Guan
2020-06-19 18:23:33 +08:00
committed by GitHub
parent 6d764fa42c 8505947e61
commit cbe9a1fb41
5 changed files with 260 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

352
java/GmSSL.c
View File

File diff suppressed because it is too large Load Diff

48
java/GmSSL.h
View File

@@ -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

1
java/GmSSL.java
View File

@@ -46,6 +46,7 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
* ====================================================================
*/
package org.gmssl;
public class GmSSL {

72
java/gmssl_err.c
View File

@@ -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}
};

46
java/gmssl_err.h
View File

@@ -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. */