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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	java/GmSSL.c
#	java/GmSSL.java
This commit is contained in:
Zhi Guan
2017-11-05 21:01:37 +08:00
parent 27bde477a5 92a13cb0ec
commit 01d30505ea
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/GmSSL.c
View File

@@ -1256,6 +1256,7 @@ end:
}
<<<<<<< HEAD
/*
static int gmssl_pkey_encrypt(const char *algor, const unsigned char *in, size_t inlen,
unsigned char *out, size_t *outlen, const unsigned char *key, size_t keylen)
@@ -1265,6 +1266,10 @@ static int gmssl_pkey_encrypt(const char *algor, const unsigned char *in, size_t
JNIEXPORT jbyteArray JNICALL Java_GmSSL_publicKeyDecrypt(
JNIEnv *env, jobject this, jstring algor,
=======
JNIEXPORT jbyteArray JNICALL Java_GmSSL_privateKeyDecrypt(
JNIEnv *env, jobject this, jstring algor, jint flag,
>>>>>>> origin/master
jbyteArray in, jbyteArray key)
{
jbyteArray ret = NULL;