@@ -379,26 +379,29 @@ void beforeBeginHandshake(SSLEngine client, SSLEngine server) {
379379
380380 @ Test
381381 public void test_TestSSLEnginePair_create () throws Exception {
382- TestSSLEnginePair test = TestSSLEnginePair .create (TestSSLContext .newBuilder ()
383- .clientProtocol (clientVersion )
384- .serverProtocol (serverVersion )
385- .build ());
382+ TestSSLContext c = TestSSLContext .newBuilder ()
383+ .clientProtocol (clientVersion )
384+ .serverProtocol (serverVersion )
385+ .build ();
386+ TestSSLEnginePair test = TestSSLEnginePair .create (c );
386387 assertNotNull (test .c );
387388 assertNotNull (test .server );
388389 assertNotNull (test .client );
389390 assertConnected (test );
390391 test .close ();
392+ c .close ();
391393 }
392394
393395 private final int NUM_STRESS_ITERATIONS = 1000 ;
394396
395397 @ Test
396398 public void test_SSLEngine_Multiple_Thread_Success () throws Exception {
397- final TestSSLEnginePair pair =
398- TestSSLEnginePair .create (TestSSLContext .newBuilder ()
399+ TestSSLContext c = TestSSLContext .newBuilder ()
399400 .clientProtocol (clientVersion )
400401 .serverProtocol (serverVersion )
401- .build ());
402+ .build ();
403+ final TestSSLEnginePair pair =
404+ TestSSLEnginePair .create (c );
402405 try {
403406 assertConnected (pair );
404407
@@ -435,16 +438,18 @@ public Void call() throws Exception {
435438 server .get ();
436439 } finally {
437440 pair .close ();
441+ c .close ();
438442 }
439443 }
440444
441445 @ Test
442446 public void test_SSLEngine_CloseOutbound () throws Exception {
443- final TestSSLEnginePair pair =
444- TestSSLEnginePair .create (TestSSLContext .newBuilder ()
447+ TestSSLContext c = TestSSLContext .newBuilder ()
445448 .clientProtocol (clientVersion )
446449 .serverProtocol (serverVersion )
447- .build ());
450+ .build ();
451+ final TestSSLEnginePair pair =
452+ TestSSLEnginePair .create (c );
448453 try {
449454 assertConnected (pair );
450455
@@ -487,16 +492,18 @@ public void test_SSLEngine_CloseOutbound() throws Exception {
487492 assertTrue (pair .server .isInboundDone () && pair .server .isOutboundDone ());
488493 } finally {
489494 pair .close ();
495+ c .close ();
490496 }
491497 }
492498
493499 @ Test
494500 public void test_SSLEngine_Closed () throws Exception {
495- final TestSSLEnginePair pair =
496- TestSSLEnginePair .create (TestSSLContext .newBuilder ()
501+ TestSSLContext c = TestSSLContext .newBuilder ()
497502 .clientProtocol (clientVersion )
498503 .serverProtocol (serverVersion )
499- .build ());
504+ .build ();
505+ final TestSSLEnginePair pair =
506+ TestSSLEnginePair .create ();
500507 pair .close ();
501508 ByteBuffer out = ByteBuffer .allocate (pair .client .getSession ().getPacketBufferSize ());
502509 SSLEngineResult res = pair .client .wrap (ByteBuffer .wrap (new byte [] {0x01 }), out );
@@ -510,6 +517,7 @@ public void test_SSLEngine_Closed() throws Exception {
510517 assertEquals (Status .CLOSED , res .getStatus ());
511518 assertEquals (0 , res .bytesConsumed ());
512519 assertEquals (0 , res .bytesProduced ());
520+ c .close ();
513521 }
514522
515523 @ Test
@@ -596,13 +604,14 @@ private static byte[] getFirstChunk(SSLEngine e) throws SSLException {
596604
597605 @ Test
598606 public void test_SSLEngine_TlsUnique () throws Exception {
607+ TestSSLContext c = TestSSLContext .newBuilder ()
608+ .clientProtocol (clientVersion )
609+ .serverProtocol (serverVersion )
610+ .build ();
599611 // tls_unique isn't supported in TLS 1.3
600612 assumeTlsV1_2Connection ();
601613 TestSSLEnginePair pair = TestSSLEnginePair .create (
602- TestSSLContext .newBuilder ()
603- .clientProtocol (clientVersion )
604- .serverProtocol (serverVersion )
605- .build (),
614+ c ,
606615 new TestSSLEnginePair .Hooks () {
607616 @ Override
608617 void beforeBeginHandshake (SSLEngine client , SSLEngine server ) {
@@ -620,16 +629,18 @@ void beforeBeginHandshake(SSLEngine client, SSLEngine server) {
620629 assertArrayEquals (clientTlsUnique , serverTlsUnique );
621630 } finally {
622631 pair .close ();
632+ c .close ();
623633 }
624634 }
625635
626636 @ Test
627637 public void test_SSLEngine_EKM () throws Exception {
638+ TestSSLContext c = TestSSLContext .newBuilder ()
639+ .clientProtocol (clientVersion )
640+ .serverProtocol (serverVersion )
641+ .build ();
628642 TestSSLEnginePair pair = TestSSLEnginePair .create (
629- TestSSLContext .newBuilder ()
630- .clientProtocol (clientVersion )
631- .serverProtocol (serverVersion )
632- .build (),
643+ c ,
633644 new TestSSLEnginePair .Hooks () {
634645 @ Override
635646 void beforeBeginHandshake (SSLEngine client , SSLEngine server ) {
@@ -671,6 +682,7 @@ void beforeBeginHandshake(SSLEngine client, SSLEngine server) {
671682 }
672683 } finally {
673684 pair .close ();
685+ c .close ();
674686 }
675687 }
676688
@@ -742,18 +754,20 @@ public X509Certificate[] getAcceptedIssuers() {
742754 assertTrue (expected .getCause () instanceof CertificateException );
743755 }
744756 assertTrue (trustManager .threw );
757+ referenceContext .close ();
745758 }
746759
747760 @ Test
748761 public void sniHandlerFailureResultsInHandshakeError () throws Exception {
749762 assumeJava8 ();
750763
764+ TestSSLContext c = TestSSLContext .newBuilder ()
765+ .clientProtocol (clientVersion )
766+ .serverProtocol (serverVersion )
767+ .build ();
751768 try {
752769 TestSSLEnginePair .create (
753- TestSSLContext .newBuilder ()
754- .clientProtocol (clientVersion )
755- .serverProtocol (serverVersion )
756- .build (),
770+ c ,
757771 new TestSSLEnginePair .Hooks () {
758772 @ Override
759773 void beforeBeginHandshake (SSLEngine client , SSLEngine server ) {
@@ -768,6 +782,7 @@ void beforeBeginHandshake(SSLEngine client, SSLEngine server) {
768782 } catch (SSLHandshakeException e ) {
769783 assertEquals ("SNI match failed: any.host" , e .getMessage ());
770784 }
785+ c .close ();
771786 }
772787
773788 @ Test
0 commit comments