Skip to content

Commit dae452b

Browse files
committed
add get/setUseCipherSuitesOrder to ParametersHelper
1 parent b2555d4 commit dae452b

1 file changed

Lines changed: 27 additions & 6 deletions

File tree

src/java/com/wolfssl/provider/jsse/WolfSSLParametersHelper.java

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ public class WolfSSLParametersHelper
4343
private static Method setSNIMatchers = null;
4444
private static Method getMaximumPacketSize = null;
4545
private static Method setMaximumPacketSize = null;
46+
private static Method setUseCipherSuitesOrder = null;
47+
private static Method getUseCipherSuitesOrder = null;
4648

4749
/** Default WolfSSLParametersHelper constructor */
4850
public WolfSSLParametersHelper() { }
@@ -91,6 +93,12 @@ public Object run() {
9193
case "setMaximumPacketSize":
9294
setMaximumPacketSize = m;
9395
continue;
96+
case "setUseCipherSuitesOrder":
97+
setUseCipherSuitesOrder = m;
98+
continue;
99+
case "getUseCipherSuitesOrder":
100+
getUseCipherSuitesOrder = m;
101+
continue;
94102
default:
95103
continue;
96104
}
@@ -167,6 +175,11 @@ protected static SSLParameters decoupleParams(WolfSSLParameters in) {
167175
mth = cls.getDeclaredMethod("setSNIMatchers", paramList);
168176
mth.invoke(obj, ret, setSNIMatchers, in);
169177
}
178+
if (setUseCipherSuitesOrder != null) {
179+
mth = cls.getDeclaredMethod("setUseCipherSuitesOrder",
180+
paramList);
181+
mth.invoke(obj, ret, setUseCipherSuitesOrder, in);
182+
}
170183

171184
} catch (Exception e) {
172185
/* ignore, class not found */
@@ -193,15 +206,20 @@ protected static SSLParameters decoupleParams(WolfSSLParameters in) {
193206
/* Not available, just ignore and continue */
194207
}
195208

209+
try {
210+
if (setUseCipherSuitesOrder != null) {
211+
ret.setUseCipherSuitesOrder(in.getUseCipherSuitesOrder());
212+
}
213+
} catch (Exception e) {
214+
/* Not available, just ignore and continue */
215+
}
216+
196217
/* The following SSLParameters features are not yet supported
197218
* by wolfJSSE (see Android API 23 note above). They are supported
198219
* with newer versions of SSLParameters, but will need to be added
199220
* conditionally to wolfJSSE when supported. */
200221
/*ret.setAlgorithmConstraints(in.getAlgorithmConstraints());
201222
ret.setEnableRetransmissions(in.getEnableRetransmissions());
202-
ret.setMaximumPacketSize(in.getMaximumPacketSize());
203-
ret.setSNIMatchers(in.getSNIMatchers());
204-
ret.setUseCipherSuitesOrder(in.getUseCipherSuitesOrder());
205223
*/
206224

207225
return ret;
@@ -271,6 +289,11 @@ protected static void importParams(SSLParameters in,
271289
mth = cls.getDeclaredMethod("getSNIMatchers", paramList);
272290
mth.invoke(obj, in, out);
273291
}
292+
if (getUseCipherSuitesOrder != null){
293+
mth = cls.getDeclaredMethod("getUseCipherSuitesOrder",
294+
paramList);
295+
mth.invoke(obj, in, out);
296+
}
274297

275298
} catch (Exception e) {
276299
/* ignore, class not found */
@@ -296,12 +319,10 @@ protected static void importParams(SSLParameters in,
296319
* conditionally to wolfJSSE when supported. */
297320
/*out.setAlgorithmConstraints(in.getAlgorithmConstraints());
298321
out.setEnableRetransmissions(in.getEnableRetransmissions());
299-
out.setMaximumPacketSize(in.getMaximumPacketSize());
300-
out.setSNIMatchers(in.getSNIMatchers());
301-
out.setUseCipherSuitesOrder(in.getUseCipherSuitesOrder());
302322
*/
303323

304324
out.setSNIMatchers(in.getSNIMatchers());
325+
out.setUseCipherSuitesOrder(in.getUseCipherSuitesOrder());
305326

306327
}
307328
}

0 commit comments

Comments
 (0)