Skip to content
Permalink
Browse files

Merge

  • Loading branch information
prsadhuk committed Dec 3, 2019
2 parents 5019049 + c10f731 commit c7a2e3b838fffd0b041398dced70c3cce3eb2d7e
@@ -482,9 +482,9 @@ class JvmtiDeferredEvent {
// Actually posts the event.
void post() NOT_JVMTI_RETURN;
// Sweeper support to keep nmethods from being zombied while in the queue.
void nmethods_do(CodeBlobClosure* cf);
void nmethods_do(CodeBlobClosure* cf) NOT_JVMTI_RETURN;
// GC support to keep nmethod from being unloaded while in the queue.
void oops_do(OopClosure* f, CodeBlobClosure* cf);
void oops_do(OopClosure* f, CodeBlobClosure* cf) NOT_JVMTI_RETURN;
};

/**
@@ -519,9 +519,9 @@ class JvmtiDeferredEventQueue : AllStatic {
static void enqueue(const JvmtiDeferredEvent& event) NOT_JVMTI_RETURN;
static JvmtiDeferredEvent dequeue() NOT_JVMTI_RETURN_(JvmtiDeferredEvent());
// Sweeper support to keep nmethods from being zombied while in the queue.
static void nmethods_do(CodeBlobClosure* cf);
static void nmethods_do(CodeBlobClosure* cf) NOT_JVMTI_RETURN;
// GC support to keep nmethod from being unloaded while in the queue.
static void oops_do(OopClosure* f, CodeBlobClosure* cf);
static void oops_do(OopClosure* f, CodeBlobClosure* cf) NOT_JVMTI_RETURN;
};

// Utility macro that checks for NULL pointers:
@@ -217,9 +217,9 @@ public void engineLoad(InputStream stream, char[] password)
try {
@SuppressWarnings("deprecation")
KeyStoreSpi tmp = primaryKeyStore.newInstance();
tmp.engineLoad(bufferedStream, password);
keystore = tmp;
type = primaryType;
keystore.engineLoad(bufferedStream, password);

} catch (Exception e) {

@@ -236,11 +236,11 @@ public void engineLoad(InputStream stream, char[] password)
}

@SuppressWarnings("deprecation")
KeyStoreSpi tmp= secondaryKeyStore.newInstance();
KeyStoreSpi tmp = secondaryKeyStore.newInstance();
bufferedStream.reset();
tmp.engineLoad(bufferedStream, password);
keystore = tmp;
type = secondaryType;
bufferedStream.reset();
keystore.engineLoad(bufferedStream, password);

if (debug != null) {
debug.println("WARNING: switching from " +
@@ -0,0 +1,66 @@
/*
* Copyright (c) 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 8234744
* @summary KeyStore.store can write wrong type of file
*/

import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.security.KeyStore;

public class WrongStoreType {
public static void main(String ... args) throws Exception {

char[] password = "changeit".toCharArray();
KeyStore ks = KeyStore.getInstance("PKCS12");

ks.load(null, null);
System.out.println(ks.getType());

Files.createFile(Path.of("emptyfile"));
try (InputStream in = new FileInputStream("emptyfile")) {
ks.load(in, password);
} catch (Exception e) {
System.out.println(e);
}

System.out.println(ks.getType());
try (OutputStream out = new FileOutputStream("newfile")) {
ks.store(out, password);
}

ks = KeyStore.getInstance(new File("newfile"), password);
String type = ks.getType();
if (!type.equalsIgnoreCase("PKCS12")) {
throw new Exception("see storetype " + type);
}
}
}

0 comments on commit c7a2e3b

Please sign in to comment.
You can’t perform that action at this time.