Skip to content

Commit aa92214

Browse files
peterdettmanpeterdettman
committed
BCJSSE: earlyNamedGroups => earlyKeyShares
- BCSSLParameters.earlyKeyShares property - "org.bouncycastle.jsse.client.earlyKeyShares" system property - see #2095
1 parent efccc6d commit aa92214

File tree

5 files changed

+38
-38
lines changed

5 files changed

+38
-38
lines changed

‎tls/src/main/java/org/bouncycastle/jsse/BCSSLParameters.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ private static <T> List<T> copyList(Collection<T> list)
4444
private String[] signatureSchemes = null;
4545
private String[] signatureSchemesCert = null;
4646
private String[] namedGroups = null;
47-
private String[] earlyNamedGroups = null;
47+
private String[] earlyKeyShares = null;
4848

4949
public BCSSLParameters()
5050
{
@@ -328,33 +328,33 @@ public void setNamedGroups(String[] namedGroups)
328328
this.namedGroups = check;
329329
}
330330

331-
public String[] getEarlyNamedGroups()
331+
public String[] getEarlyKeyShares()
332332
{
333-
return TlsUtils.clone(earlyNamedGroups);
333+
return TlsUtils.clone(earlyKeyShares);
334334
}
335335

336-
public void setEarlyNamedGroups(String[] earlyNamedGroups)
336+
public void setEarlyKeyShares(String[] earlyKeyShares)
337337
{
338338
String[] check = null;
339339

340-
if (earlyNamedGroups != null)
340+
if (earlyKeyShares != null)
341341
{
342-
check = TlsUtils.clone(earlyNamedGroups);
342+
check = TlsUtils.clone(earlyKeyShares);
343343
HashSet<String> seenEntries = new HashSet<String>();
344344
for (String entry : check)
345345
{
346346
if (TlsUtils.isNullOrEmpty(entry))
347347
{
348-
throw new IllegalArgumentException("'earlyNamedGroups' entries cannot be null or empty strings");
348+
throw new IllegalArgumentException("'earlyKeyShares' entries cannot be null or empty strings");
349349
}
350350

351351
if (!seenEntries.add(entry))
352352
{
353-
throw new IllegalArgumentException("'earlyNamedGroups' contains duplicate entry: " + entry);
353+
throw new IllegalArgumentException("'earlyKeyShares' contains duplicate entry: " + entry);
354354
}
355355
}
356356
}
357357

358-
this.earlyNamedGroups = check;
358+
this.earlyKeyShares = check;
359359
}
360360
}

‎tls/src/main/java/org/bouncycastle/jsse/provider/NamedGroupInfo.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class NamedGroupInfo
2929

3030
private static final String PROPERTY_NAMED_GROUPS = "jdk.tls.namedGroups";
3131

32-
private static final String PROPERTY_BC_EARLY_NAMED_GROUPS = "org.bouncycastle.jsse.client.earlyNamedGroups";
32+
private static final String PROPERTY_BC_EARLY_KEY_SHARES = "org.bouncycastle.jsse.client.earlyKeyShares";
3333

3434
// NOTE: Not all of these are necessarily enabled/supported; it will be checked at runtime
3535
private enum All
@@ -289,17 +289,17 @@ private static PerConnection createPerConnection(PerContext perContext, ProvSSLP
289289

290290
Vector localEarly = null;
291291
{
292-
String[] earlyNamedGroups = sslParameters.getEarlyNamedGroups();
292+
String[] earlyKeyShares = sslParameters.getEarlyKeyShares();
293293

294294
int[] earlyCandidates;
295-
if (earlyNamedGroups == null)
295+
if (earlyKeyShares == null)
296296
{
297297
earlyCandidates = perContext.earlyCandidates;
298298
}
299299
else
300300
{
301-
earlyCandidates = createEarlyCandidates(perContext.index, earlyNamedGroups,
302-
"BCSSLParameters.earlyNamedGroups");
301+
earlyCandidates = createEarlyCandidates(perContext.index, earlyKeyShares,
302+
"BCSSLParameters.earlyKeyShares");
303303
}
304304

305305
if (earlyCandidates != null)
@@ -313,7 +313,7 @@ private static PerConnection createPerConnection(PerContext perContext, ProvSSLP
313313
NamedGroupInfo earlyNamedGroupInfo = local.get(earlyCandidate);
314314
if (earlyNamedGroupInfo == null || !earlyNamedGroupInfo.isEnabled())
315315
{
316-
LOG.warning("Candidate early named group not an enabled named group: "
316+
LOG.warning("Candidate early key share not an enabled named group: "
317317
+ NamedGroup.getName(earlyCandidates[i]));
318318
continue;
319319
}
@@ -330,7 +330,7 @@ static PerContext createPerContext(boolean isFipsContext, JcaTlsCrypto crypto)
330330
{
331331
Map<Integer, NamedGroupInfo> index = createIndex(isFipsContext, crypto);
332332
int[] candidates = createCandidatesFromProperty(index, PROPERTY_NAMED_GROUPS);
333-
int[] earlyCandidates = createEarlyCandidatesFromProperty(index, PROPERTY_BC_EARLY_NAMED_GROUPS);
333+
int[] earlyCandidates = createEarlyCandidatesFromProperty(index, PROPERTY_BC_EARLY_KEY_SHARES);
334334

335335
return new PerContext(index, candidates, earlyCandidates);
336336
}

‎tls/src/main/java/org/bouncycastle/jsse/provider/ProvSSLParameters.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private static <T> List<T> copyList(Collection<T> list)
4747
private String[] signatureSchemes = null;
4848
private String[] signatureSchemesCert = null;
4949
private String[] namedGroups = null;
50-
private String[] earlyNamedGroups = null;
50+
private String[] earlyKeyShares = null;
5151

5252
private BCApplicationProtocolSelector<SSLEngine> engineAPSelector;
5353
private BCApplicationProtocolSelector<SSLSocket> socketAPSelector;
@@ -78,7 +78,7 @@ ProvSSLParameters copy()
7878
p.signatureSchemes = signatureSchemes;
7979
p.signatureSchemesCert = signatureSchemesCert;
8080
p.namedGroups = namedGroups;
81-
p.earlyNamedGroups = earlyNamedGroups;
81+
p.earlyKeyShares = earlyKeyShares;
8282
p.engineAPSelector = engineAPSelector;
8383
p.socketAPSelector = socketAPSelector;
8484
p.sessionToResume = sessionToResume;
@@ -293,14 +293,14 @@ public void setNamedGroups(String[] namedGroups)
293293
this.namedGroups = TlsUtils.clone(namedGroups);
294294
}
295295

296-
public String[] getEarlyNamedGroups()
296+
public String[] getEarlyKeyShares()
297297
{
298-
return TlsUtils.clone(earlyNamedGroups);
298+
return TlsUtils.clone(earlyKeyShares);
299299
}
300300

301-
public void setEarlyNamedGroups(String[] earlyNamedGroups)
301+
public void setEarlyKeyShares(String[] earlyKeyShares)
302302
{
303-
this.earlyNamedGroups = TlsUtils.clone(earlyNamedGroups);
303+
this.earlyKeyShares = TlsUtils.clone(earlyKeyShares);
304304
}
305305

306306
public BCApplicationProtocolSelector<SSLEngine> getEngineAPSelector()

‎tls/src/main/jdk1.5/org/bouncycastle/jsse/provider/SSLParametersUtil.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ static BCSSLParameters getParameters(ProvSSLParameters prov)
8686
ssl.setSignatureSchemes(prov.getSignatureSchemes());
8787
ssl.setSignatureSchemesCert(prov.getSignatureSchemesCert());
8888
ssl.setNamedGroups(prov.getNamedGroups());
89-
ssl.setEarlyNamedGroups(prov.getEarlyNamedGroups());
89+
ssl.setEarlyKeyShares(prov.getEarlyKeyShares());
9090

9191
return ssl;
9292
}
@@ -182,9 +182,9 @@ static SSLParameters getSSLParameters(ProvSSLParameters prov)
182182

183183
// Unsupported as of JDK 21
184184

185-
// if (null != setEarlyNamedGroups)
185+
// if (null != setEarlyKeyShares)
186186
// {
187-
// set(ssl, setEarlyNamedGroups, prov.getEarlyNamedGroups());
187+
// set(ssl, setEarlyKeyShares, prov.getEarlyKeyShares());
188188
// }
189189

190190
// if (null != setUseNamedGroupsOrder)
@@ -298,9 +298,9 @@ static BCSSLParameters importSSLParameters(SSLParameters ssl)
298298

299299
// Unsupported as of JDK 21
300300

301-
// if (null != getEarlyNamedGroups)
301+
// if (null != getEarlyKeyShares)
302302
// {
303-
// bc.setEarlyNamedGroups((String[])get(ssl, getEarlyNamedGroups));
303+
// bc.setEarlyKeyShares((String[])get(ssl, getEarlyKeyShares));
304304
// }
305305

306306
// if (null != getUseNamedGroupsOrder)
@@ -382,7 +382,7 @@ static void setParameters(ProvSSLParameters prov, BCSSLParameters ssl)
382382

383383
prov.setNamedGroups(ssl.getNamedGroups());
384384

385-
prov.setEarlyNamedGroups(ssl.getEarlyNamedGroups());
385+
prov.setEarlyKeyShares(ssl.getEarlyKeyShares());
386386

387387
prov.setSignatureSchemesCert(ssl.getSignatureSchemesCert());
388388
}
@@ -495,9 +495,9 @@ static void setSSLParameters(ProvSSLParameters prov, SSLParameters ssl)
495495

496496
// Unsupported as of JDK 21
497497

498-
// if (null != getEarlyNamedGroups)
498+
// if (null != getEarlyKeyShares)
499499
// {
500-
// prov.setEarlyNamedGroups((String[])get(ssl, getEarlyNamedGroups));
500+
// prov.setEarlyKeyShares((String[])get(ssl, getEarlyKeyShares));
501501
// }
502502

503503
// if (null != getUseNamedGroupsOrder)

‎tls/src/main/jdk1.9/org/bouncycastle/jsse/provider/SSLParametersUtil.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static BCSSLParameters getParameters(ProvSSLParameters prov)
5757
ssl.setSignatureSchemes(prov.getSignatureSchemes());
5858
ssl.setSignatureSchemesCert(prov.getSignatureSchemesCert());
5959
ssl.setNamedGroups(prov.getNamedGroups());
60-
ssl.setEarlyNamedGroups(prov.getEarlyNamedGroups());
60+
ssl.setEarlyKeyShares(prov.getEarlyKeyShares());
6161

6262
return ssl;
6363
}
@@ -134,9 +134,9 @@ static SSLParameters getSSLParameters(ProvSSLParameters prov)
134134

135135
// Unsupported as of JDK 21
136136

137-
// if (null != setEarlyNamedGroups)
137+
// if (null != setEarlyKeyShares)
138138
// {
139-
// set(ssl, setEarlyNamedGroups, prov.getEarlyNamedGroups());
139+
// set(ssl, setEarlyKeyShares, prov.getEarlyKeyShares());
140140
// }
141141

142142
// if (null != setUseNamedGroupsOrder)
@@ -236,9 +236,9 @@ static BCSSLParameters importSSLParameters(SSLParameters ssl)
236236

237237
// Unsupported as of JDK 21
238238

239-
// if (null != getEarlyNamedGroups)
239+
// if (null != getEarlyKeyShares)
240240
// {
241-
// bc.setEarlyNamedGroups((String[])get(ssl, getEarlyNamedGroups));
241+
// bc.setEarlyKeyShares((String[])get(ssl, getEarlyKeyShares));
242242
// }
243243

244244
// if (null != getUseNamedGroupsOrder)
@@ -320,7 +320,7 @@ static void setParameters(ProvSSLParameters prov, BCSSLParameters ssl)
320320

321321
prov.setNamedGroups(ssl.getNamedGroups());
322322

323-
prov.setEarlyNamedGroups(ssl.getEarlyNamedGroups());
323+
prov.setEarlyKeyShares(ssl.getEarlyKeyShares());
324324

325325
prov.setSignatureSchemesCert(ssl.getSignatureSchemesCert());
326326
}
@@ -419,9 +419,9 @@ static void setSSLParameters(ProvSSLParameters prov, SSLParameters ssl)
419419

420420
// Unsupported as of JDK 21
421421

422-
// if (null != getEarlyNamedGroups)
422+
// if (null != getEarlyKeyShares)
423423
// {
424-
// prov.setEarlyNamedGroups((String[])get(ssl, getEarlyNamedGroups));
424+
// prov.setEarlyKeyShares((String[])get(ssl, getEarlyKeyShares));
425425
// }
426426

427427
// if (null != getUseNamedGroupsOrder)

0 commit comments

Comments
 (0)