test/jdk/javax/net/ssl/Stapling/SSLEngineWithStapling.java

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 307,320 ****
          TrustManagerFactory cliTmf =
                  TrustManagerFactory.getInstance("PKIX");
          cliTmf.init(mfp);
  
          // Create the SSLContexts from the factories
!         SSLContext servCtx = SSLContext.getInstance("TLS");
          servCtx.init(servKmf.getKeyManagers(), servTmf.getTrustManagers(),
                  null);
!         SSLContext cliCtx = SSLContext.getInstance("TLS");
          cliCtx.init(null, cliTmf.getTrustManagers(), null);
  
  
          /*
           * Configure the serverEngine to act as a server in the SSL/TLS
--- 307,320 ----
          TrustManagerFactory cliTmf =
                  TrustManagerFactory.getInstance("PKIX");
          cliTmf.init(mfp);
  
          // Create the SSLContexts from the factories
!         SSLContext servCtx = SSLContext.getInstance("TLSv1.2");
          servCtx.init(servKmf.getKeyManagers(), servTmf.getTrustManagers(),
                  null);
!         SSLContext cliCtx = SSLContext.getInstance("TLSv1.2");
          cliCtx.init(null, cliTmf.getTrustManagers(), null);
  
  
          /*
           * Configure the serverEngine to act as a server in the SSL/TLS
*** 635,646 ****
      }
  
      /**
       * Checks a validation failure to see if it failed for the reason we think
       * it should.  This comes in as an SSLException of some sort, but it
!      * encapsulates a ValidatorException which in turn encapsulates the
!      * CertPathValidatorException we are interested in.
       *
       * @param e the exception thrown at the top level
       * @param reason the underlying CertPathValidatorException BasicReason
       * we are expecting it to have.
       *
--- 635,646 ----
      }
  
      /**
       * Checks a validation failure to see if it failed for the reason we think
       * it should.  This comes in as an SSLException of some sort, but it
!      * encapsulates a CertPathValidatorException at some point in the
!      * exception stack.
       *
       * @param e the exception thrown at the top level
       * @param reason the underlying CertPathValidatorException BasicReason
       * we are expecting it to have.
       *
*** 648,671 ****
       */
      static boolean checkClientValidationFailure(Exception e,
              CertPathValidatorException.BasicReason reason) {
          boolean result = false;
  
!         if (e instanceof SSLException) {
!             Throwable sslhe = e.getCause();
!             if (sslhe instanceof SSLHandshakeException) {
!                 Throwable valExc = sslhe.getCause();
!                 if (valExc instanceof sun.security.validator.ValidatorException) {
!                     Throwable cause = valExc.getCause();
!                     if (cause instanceof CertPathValidatorException) {
!                         CertPathValidatorException cpve =
!                                 (CertPathValidatorException)cause;
                          if (cpve.getReason() == reason) {
                              result = true;
                          }
                      }
!                 }
!             }
!         }
          return result;
      }
  }
--- 648,680 ----
       */
      static boolean checkClientValidationFailure(Exception e,
              CertPathValidatorException.BasicReason reason) {
          boolean result = false;
  
!         // Locate the CertPathValidatorException.  If one
!         // Does not exist, then it's an automatic failure of
!         // the test.
!         Throwable curExc = e;
!         CertPathValidatorException cpve = null;
!         while (curExc != null) {
!             if (curExc instanceof CertPathValidatorException) {
!                 cpve = (CertPathValidatorException)curExc;
!             }
!             curExc = curExc.getCause();
!         }
! 
!         // If we get through the loop and cpve is null then we
!         // we didn't find CPVE and this is a failure
!         if (cpve != null) {
              if (cpve.getReason() == reason) {
                  result = true;
+             } else {
+                 System.out.println("CPVE Reason Mismatch: Expected = " +
+                         reason + ", Actual = " + cpve.getReason());
              }
+         } else {
+             System.out.println("Failed to find an expected CPVE");
          }
! 
          return result;
      }
  }