Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/*
* @test id=GenerateOpensslPKCS12
* @bug 8076190 8242151 8153005 8266182
* @bug 8076190 8242151 8153005 8266182 8362894
* @summary This is java keytool <-> openssl interop test. This test generates
* some openssl keystores on the fly, java operates on it and
* vice versa.
Expand Down Expand Up @@ -138,6 +138,11 @@ private static void generateInitialKeystores(String opensslPath)
"pass:changeit", "-certpbe", "AES-256-CBC", "-keypbe",
"AES-256-CBC", "-macalg", "SHA512")
.shouldHaveExitValue(0);

ProcessTools.executeCommand(opensslPath, "pkcs12", "-export", "-in",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: do you think it might be a good idea to bump the timeout by 10? As this command can take up to 10 seconds. Just to prevent future timeouts

"kandc", "-out", "os6", "-name", "a", "-passout",
"pass:changeit", "-pbmac1_pbkdf2", "-macalg", "sha256")
.shouldHaveExitValue(0);
}

private static void testWithJavaCommands() throws Throwable {
Expand Down Expand Up @@ -168,6 +173,8 @@ private static void testWithJavaCommands() throws Throwable {
// no storepass no cert
check("os5", "a", null, "changeit", true, false, true);

check("os6", "a", "changeit", "changeit", true, true, true);

// keytool

// Current default pkcs12 setting
Expand Down
2 changes: 2 additions & 0 deletions test/jdk/sun/security/pkcs12/params/README
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ openssl pkcs12 -export -in kandc -out os4 -name a -passout pass:changeit \
-certpbe PBE-SHA1-RC4-128 -keypbe PBE-SHA1-RC4-128 -macalg SHA224
openssl pkcs12 -export -in kandc -out os5 -name a -passout pass:changeit \
-certpbe AES-256-CBC -keypbe AES-256-CBC -macalg SHA512
openssl pkcs12 -export -in kandc -out os6 -name a -passout pass:changeit \
-pbmac1_pbkdf2 -macalg sha256
for a in *; do
openssl base64 -in $a -out ../$a
done
Expand Down
23 changes: 23 additions & 0 deletions test/jdk/sun/security/pkcs12/params/os6
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
MIIEOgIBAzCCA7QGCSqGSIb3DQEHAaCCA6UEggOhMIIDnTCCAmoGCSqGSIb3DQEH
BqCCAlswggJXAgEAMIICUAYJKoZIhvcNAQcBMF8GCSqGSIb3DQEFDTBSMDEGCSqG
SIb3DQEFDDAkBBBEpg+dmjxfnLMTmaHD/RjPAgIIADAMBggqhkiG9w0CCQUAMB0G
CWCGSAFlAwQBKgQQT731bM49PtePx/S4Xf6UZICCAeBeDpWGfpMn8d+wcAoHjUyg
+ceG2y75ac4UVsnVSpYCZaPHcOvUDbTAk5ylMGseLvl3x7xHmovIlShW1IBUWpTe
LhWNpa2f5yZ7t/BXB/oJFT7ol17WznHgmmCi6XbdiGq1YSV3X7SQEBw8WBWeOjGb
IURTAZCLMbGLXkSdg+2DRgP+PpM/Y29vFK2vo72s8bfYS9bGitEreyafP/jv8GxN
6SZx9+FSpTQ92Yj8qyFxvkR4fDyBnYe50KLf/bZmGMBq/d19lxNoheLGfuZ2ZM7W
Mw+wePBJsyntJfcce8iWjt6M8epVmx8SwarNkLU3UiX5XPDGJnnI/0QXEvJ2skQW
y9kCTP4DRYd2kg0tRvpsrK2DraP6xxBCviixoil1rbiQHmOhj6RKx1grGw94nvZq
JM7rZbKN3DvjSwjRn8S2QvycqGYhrQhwoQGqajmCuuBrkM6FCQUKjoWja1XCeQ3Q
8aRnQxwypB46Jrvvn4t3GghF3ZJ0X9LuimXQo9GAXf+X7eNOPpjFrIWlgICTgRN+
v9elrcUOUKb9C24/Zws/B3nq8fvB9WY0Q9qaVZz9KUKfPjK1QwEr++5xJ5sBZgJz
kZNV0n4dxe4oCN+pE9ztpEswf4sWER92G+YDZB0IEV4wggErBgkqhkiG9w0BBwGg
ggEcBIIBGDCCARQwggEQBgsqhkiG9w0BDAoBAqCBxjCBwzBfBgkqhkiG9w0BBQ0w
UjAxBgkqhkiG9w0BBQwwJAQQvMlpTtrcoqg0XEC3z6KFEgICCAAwDAYIKoZIhvcN
AgkFADAdBglghkgBZQMEASoEEO7wolHeKZyoyII6h3l+iQ4EYEyg6yJWNUWo8ug2
QNsXVUWmUb9nfu0+nIuhnpBwRewveSv+XMZ+C8szRQsefeMdfjzy91M/ZSHkR73K
HcKdUTVI5zNdBd61g9VNL6CvQCPZIj7AW5bsJ2cZg/GjpsepcDE4MBEGCSqGSIb3
DQEJFDEEHgIAYTAjBgkqhkiG9w0BCRUxFgQUxCJpJWSVzAG4ZpwKuIUAgKBtWAkw
fTBtMEkGCSqGSIb3DQEFDjA8MCwGCSqGSIb3DQEFDDAfBAgMIRBR5kB3lgICCAAC
ASAwDAYIKoZIhvcNAgkFADAMBggqhkiG9w0CCQUABCDM5Ec9Anci3+OswMqEX22f
uAUrp9IqJSBF3ZY2g86utgQIDCEQUeZAd5YCAggA