-
Notifications
You must be signed in to change notification settings - Fork 236
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8180573: Refactor sun/security/tools shell tests to plain java tests
Reviewed-by: mdoerr Backport-of: 15aae2f
- Loading branch information
1 parent
2b9261a
commit efef574
Showing
73 changed files
with
2,519 additions
and
2,969 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,96 @@ | ||
/* | ||
* Copyright (c) 2005, 2019, 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. | ||
* | ||
* This code is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
* version 2 for more details (a copy is included in the LICENSE file that | ||
* accompanied this code). | ||
* | ||
* You should have received a copy of the GNU General Public License version | ||
* 2 along with this work; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
* or visit www.oracle.com if you need additional information or have any | ||
* questions. | ||
*/ | ||
|
||
/* | ||
* @test | ||
* @bug 5094028 6219522 | ||
* @summary test new jarsigner -sigalg and -digestalg options | ||
* @author Sean Mullan | ||
* @library /test/lib | ||
*/ | ||
|
||
import jdk.test.lib.SecurityTools; | ||
import jdk.test.lib.process.OutputAnalyzer; | ||
|
||
import java.nio.file.Files; | ||
import java.nio.file.Path; | ||
import java.util.ArrayList; | ||
import java.util.List; | ||
|
||
public class AlgOptions { | ||
public static void main(String[] args) throws Exception { | ||
|
||
// copy jar file into writeable location | ||
Files.copy(Path.of(System.getProperty("test.src"), "AlgOptions.jar"), | ||
Path.of("AlgOptionsTmp.jar")); | ||
|
||
// test missing signature algorithm arg | ||
sign("-sigalg").shouldNotHaveExitValue(0); | ||
|
||
// test missing digest algorithm arg | ||
sign("-digestalg").shouldNotHaveExitValue(0); | ||
|
||
// test BOGUS signature algorithm | ||
sign("-sigalg", "BOGUS").shouldNotHaveExitValue(0); | ||
|
||
// test BOGUS digest algorithm | ||
sign("-digestalg", "BOGUS").shouldNotHaveExitValue(0); | ||
|
||
// test incompatible signature algorithm | ||
sign("-sigalg", "SHA1withDSA").shouldNotHaveExitValue(0); | ||
|
||
// test compatible signature algorithm | ||
sign("-sigalg", "SHA512withRSA").shouldHaveExitValue(0); | ||
verify(); | ||
|
||
// test non-default digest algorithm | ||
sign("-digestalg", "SHA-1").shouldHaveExitValue(0); | ||
verify(); | ||
|
||
// test SHA-512 digest algorithm (creates long lines) | ||
sign("-digestalg", "SHA-512", "-sigalg", "SHA512withRSA") | ||
.shouldHaveExitValue(0); | ||
verify(); | ||
} | ||
|
||
static OutputAnalyzer sign(String... options) throws Exception { | ||
List<String> args = new ArrayList<>(); | ||
args.add("-keystore"); | ||
args.add(Path.of(System.getProperty("test.src"), "JarSigning.keystore") | ||
.toString()); | ||
args.add("-storepass"); | ||
args.add("bbbbbb"); | ||
for (String option : options) { | ||
args.add(option); | ||
} | ||
args.add("AlgOptionsTmp.jar"); | ||
args.add("c"); | ||
return SecurityTools.jarsigner(args); | ||
} | ||
|
||
static void verify() throws Exception { | ||
SecurityTools.jarsigner( | ||
"-verify", "AlgOptionsTmp.jar") | ||
.shouldHaveExitValue(0); | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
efef574
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues