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

21
java/GmSSL.java
View File

@@ -60,6 +60,7 @@ public class GmSSL {
public native int getCipherIVLength(String cipher);
public native int getCipherKeyLength(String cipher);
public native int getCipherBlockSize(String cipher);
<<<<<<< HEAD
public native byte[] symmetricEncrypt(String cipher, byte[] in, byte[] key, byte[] iv);
public native byte[] symmetricDecrypt(String cipher, byte[] in, byte[] key, byte[] iv);
public native int getDigestLength(String digest);
@@ -73,6 +74,26 @@ public class GmSSL {
public native byte[] publicKeyDecrypt(String algor, byte[] in, byte[] privateKey);
public native byte[] deriveKey(String algor, int keyLength, byte[] peerPublicKey, byte[] privateKey);
public native String[] getErrorStrings();
=======
public native byte [] symmetricEncrypt(String cipher, int flag, byte [] in, byte [] key, byte [] iv);
public native byte [] symmetricDecrypt(String cipher, int flag, byte [] in, byte [] key, byte [] iv);
public native String [] getDigests(boolean aliases);
public native int getDigestLength(String digestAlgor);
public native int getDigestBlockSize(String digestAlgor);
public native byte [] digest(String algor, int flag, byte [] data);
public native String [] getMacs(boolean aliases);
public native String [] getMacLength(String algor);
public native byte [] mac(String algor, int flag, byte [] data, byte [] key);
public native String [] getSignAlgorithms(boolean aliases);
public native byte [] sign(String algor, int flag, byte [] data, byte [] privateKey);
public native int verify(String algor, int flag, byte [] digest, byte [] signature, byte [] publicKey);
public native String [] getPublicKeyEncryptions(boolean aliases);
public native byte [] publicKeyEncrypt(String algor, int flag, byte [] in, byte [] publicKey);
public native byte [] privateKeyDecrypt(String algor, int falg, byte [] in, byte [] privateKey);
public native String [] getDeriveKeyAlgorithms(boolean aliases);
public native byte [] deriveKey(String algor, int flag, int keyLength, byte [] peerPublicKey, byte [] privateKey);
public native String getErrorString();
>>>>>>> origin/master
public static void main(String[] args) {
int i;