jdk/test/sun/security/tools/jarsigner/TimestampCheck.java

rev 17251 : 8180888: move jdk.testlibrary.JarUtils to the top level testlibrary
Reviewed-by: duke

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 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) 2003, 2017, 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.
*** 43,53 ****
  import java.util.jar.JarEntry;
  import java.util.jar.JarFile;
  
  import jdk.test.lib.SecurityTools;
  import jdk.testlibrary.*;
! import jdk.testlibrary.JarUtils;
  import sun.security.pkcs.ContentInfo;
  import sun.security.pkcs.PKCS7;
  import sun.security.pkcs.PKCS9Attribute;
  import sun.security.pkcs.SignerInfo;
  import sun.security.timestamp.TimestampToken;
--- 43,53 ----
  import java.util.jar.JarEntry;
  import java.util.jar.JarFile;
  
  import jdk.test.lib.SecurityTools;
  import jdk.testlibrary.*;
! import jdk.test.lib.util.JarUtils;
  import sun.security.pkcs.ContentInfo;
  import sun.security.pkcs.PKCS7;
  import sun.security.pkcs.PKCS9Attribute;
  import sun.security.pkcs.SignerInfo;
  import sun.security.timestamp.TimestampToken;
*** 555,565 ****
          args.addAll(Arrays.asList(extra));
          return jarsigner(args);
      }
  
      static void prepare() throws Exception {
!         jdk.testlibrary.JarUtils.createJar("old.jar", "A");
          Files.deleteIfExists(Paths.get("tsks"));
          keytool("-alias ca -genkeypair -ext bc -dname CN=CA");
          keytool("-alias old -genkeypair -dname CN=old");
          keytool("-alias dsakey -genkeypair -keyalg DSA -dname CN=dsakey");
          keytool("-alias weakkeysize -genkeypair -keysize 512 -dname CN=weakkeysize");
--- 555,565 ----
          args.addAll(Arrays.asList(extra));
          return jarsigner(args);
      }
  
      static void prepare() throws Exception {
!         JarUtils.createJar("old.jar", "A");
          Files.deleteIfExists(Paths.get("tsks"));
          keytool("-alias ca -genkeypair -ext bc -dname CN=CA");
          keytool("-alias old -genkeypair -dname CN=old");
          keytool("-alias dsakey -genkeypair -keyalg DSA -dname CN=dsakey");
          keytool("-alias weakkeysize -genkeypair -keysize 512 -dname CN=weakkeysize");