WolfSSL
/
wolfssljni
mirror of https://github.com/wolfSSL/wolfssljni.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix Public Key callback registration in example client and server

pull/18/head
Chris Conlon 2018-03-02 14:12:38 -07:00
parent 2ae0bec4ba
commit 6ba93fc65e
2 changed files with 48 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
examples/Client.java
View File

@ -342,6 +342,29 @@ public class Client {
sslCtx.setDecryptVerifyCb(dvcb);
}
/* register public key callbacks, ctx setup is later */
if (pkCallbacks == 1) {
/* ECC */
MyEccSignCallback eccSign = new MyEccSignCallback();
MyEccVerifyCallback eccVerify = new MyEccVerifyCallback();
MyEccSharedSecretCallback eccSharedSecret =
new MyEccSharedSecretCallback();
sslCtx.setEccSignCb(eccSign);
sslCtx.setEccVerifyCb(eccVerify);
sslCtx.setEccSharedSecretCb(eccSharedSecret);
/* RSA */
MyRsaSignCallback rsaSign = new MyRsaSignCallback();
MyRsaVerifyCallback rsaVerify = new MyRsaVerifyCallback();
MyRsaEncCallback rsaEnc = new MyRsaEncCallback();
MyRsaDecCallback rsaDec = new MyRsaDecCallback();
sslCtx.setRsaSignCb(rsaSign);
sslCtx.setRsaVerifyCb(rsaVerify);
sslCtx.setRsaEncCb(rsaEnc);
sslCtx.setRsaDecCb(rsaDec);
}
if (benchmark != 0) {
int times = benchmark;
int i = 0;
@ -452,37 +475,22 @@ public class Client {
}
if (pkCallbacks == 1) {
/* register public key callbacks */
/* register public key callback user contexts */
/* ECC */
MyEccSignCallback eccSign = new MyEccSignCallback();
MyEccVerifyCallback eccVerify = new MyEccVerifyCallback();
MyEccSharedSecretCallback eccSharedSecret =
new MyEccSharedSecretCallback();
MyEccSignCtx eccSignCtx = new MyEccSignCtx();
MyEccVerifyCtx eccVerifyCtx = new MyEccVerifyCtx();
MyEccSharedSecretCtx eccSharedSecretCtx =
new MyEccSharedSecretCtx();
sslCtx.setEccSignCb(eccSign);
sslCtx.setEccVerifyCb(eccVerify);
sslCtx.setEccSharedSecretCb(eccSharedSecret);
ssl.setEccSignCtx(eccSignCtx);
ssl.setEccVerifyCtx(eccVerifyCtx);
ssl.setEccSharedSecretCtx(eccSharedSecretCtx);
/* RSA */
MyRsaSignCallback rsaSign = new MyRsaSignCallback();
MyRsaVerifyCallback rsaVerify = new MyRsaVerifyCallback();
MyRsaEncCallback rsaEnc = new MyRsaEncCallback();
MyRsaDecCallback rsaDec = new MyRsaDecCallback();
MyRsaSignCtx rsaSignCtx = new MyRsaSignCtx();
MyRsaVerifyCtx rsaVerifyCtx = new MyRsaVerifyCtx();
MyRsaEncCtx rsaEncCtx = new MyRsaEncCtx();
MyRsaDecCtx rsaDecCtx = new MyRsaDecCtx();
sslCtx.setRsaSignCb(rsaSign);
sslCtx.setRsaVerifyCb(rsaVerify);
sslCtx.setRsaEncCb(rsaEnc);
sslCtx.setRsaDecCb(rsaDec);
ssl.setRsaSignCtx(rsaSignCtx);
ssl.setRsaVerifyCtx(rsaVerifyCtx);
ssl.setRsaEncCtx(rsaEncCtx);

40
examples/Server.java
View File

@ -362,6 +362,29 @@ public class Server {
sslCtx.setDecryptVerifyCb(dvcb);
}
/* register public key callbacks, ctx setup later */
if (pkCallbacks == 1) {
/* ECC */
MyEccSignCallback eccSign = new MyEccSignCallback();
MyEccVerifyCallback eccVerify = new MyEccVerifyCallback();
MyEccSharedSecretCallback eccSharedSecret =
new MyEccSharedSecretCallback();
sslCtx.setEccSignCb(eccSign);
sslCtx.setEccVerifyCb(eccVerify);
sslCtx.setEccSharedSecretCb(eccSharedSecret);
/* RSA */
MyRsaSignCallback rsaSign = new MyRsaSignCallback();
MyRsaVerifyCallback rsaVerify = new MyRsaVerifyCallback();
MyRsaEncCallback rsaEnc = new MyRsaEncCallback();
MyRsaDecCallback rsaDec = new MyRsaDecCallback();
sslCtx.setRsaSignCb(rsaSign);
sslCtx.setRsaVerifyCb(rsaVerify);
sslCtx.setRsaEncCb(rsaEnc);
sslCtx.setRsaDecCb(rsaDec);
}
/* create server socket, later if DTLS */
if (doDTLS == 0) {
serverSocket = new ServerSocket(port);
@ -484,37 +507,22 @@ public class Server {
}
if (pkCallbacks == 1) {
/* register public key callbacks */
/* register public key callback user contexts */
/* ECC */
MyEccSignCallback eccSign = new MyEccSignCallback();
MyEccVerifyCallback eccVerify = new MyEccVerifyCallback();
MyEccSharedSecretCallback eccSharedSecret =
new MyEccSharedSecretCallback();
MyEccSignCtx eccSignCtx = new MyEccSignCtx();
MyEccVerifyCtx eccVerifyCtx = new MyEccVerifyCtx();
MyEccSharedSecretCtx eccSharedSecretCtx =
new MyEccSharedSecretCtx();
sslCtx.setEccSignCb(eccSign);
sslCtx.setEccVerifyCb(eccVerify);
sslCtx.setEccSharedSecretCb(eccSharedSecret);
ssl.setEccSignCtx(eccSignCtx);
ssl.setEccVerifyCtx(eccVerifyCtx);
ssl.setEccSharedSecretCtx(eccSharedSecretCtx);
/* RSA */
MyRsaSignCallback rsaSign = new MyRsaSignCallback();
MyRsaVerifyCallback rsaVerify = new MyRsaVerifyCallback();
MyRsaEncCallback rsaEnc = new MyRsaEncCallback();
MyRsaDecCallback rsaDec = new MyRsaDecCallback();
MyRsaSignCtx rsaSignCtx = new MyRsaSignCtx();
MyRsaVerifyCtx rsaVerifyCtx = new MyRsaVerifyCtx();
MyRsaEncCtx rsaEncCtx = new MyRsaEncCtx();
MyRsaDecCtx rsaDecCtx = new MyRsaDecCtx();
sslCtx.setRsaSignCb(rsaSign);
sslCtx.setRsaVerifyCb(rsaVerify);
sslCtx.setRsaEncCb(rsaEnc);
sslCtx.setRsaDecCb(rsaDec);
ssl.setRsaSignCtx(rsaSignCtx);
ssl.setRsaVerifyCtx(rsaVerifyCtx);
ssl.setRsaEncCtx(rsaEncCtx);