infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 03:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

8342682: Errors related to unused code on Windows after 8339120 in dt_shmem jdwp security and jpackage

Browse Source 
Reviewed-by: cjplummer, asemenyuk, almatvee
This commit is contained in:
Julian Waters 2025-07-08 01:27:11 +00:00
parent ec7c6be6a9
commit 563a3358f6
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp
View File

@ -1313,6 +1313,7 @@ void showProperty(NCRYPT_HANDLE hKey) {
EXPORT_BLOB(NCRYPT_PKCS7_ENVELOPE_BLOB);
//EXPORT_BLOB(NCRYPTBUFFER_CERT_BLOB);
//EXPORT_BLOB(NCRYPT_PKCS8_PRIVATE_KEY_BLOB);
/*
BCryptBuffer bb;
bb.BufferType = NCRYPTBUFFER_PKCS_SECRET;
bb.cbBuffer = 18;
@ -1321,6 +1322,7 @@ void showProperty(NCRYPT_HANDLE hKey) {
bbd.ulVersion = 0;
bbd.cBuffers = 1;
bbd.pBuffers = &bb;
*/
if(::NCryptExportKey(hKey, NULL, NCRYPT_PKCS8_PRIVATE_KEY_BLOB, NULL,
(PBYTE)buffer, 8192, &len, NCRYPT_SILENT_FLAG) == ERROR_SUCCESS) {
snprintf(header, sizeof(header), "NCRYPT_PKCS8_PRIVATE_KEY_BLOB %ls", NCRYPT_PKCS8_PRIVATE_KEY_BLOB);

2
src/jdk.jdi/windows/native/libdt_shmem/shmem_md.c
View File

@ -37,8 +37,6 @@
* yet.
*/
static HANDLE memHandle = NULL;
int
sysSharedMemCreate(const char *name, int length,
sys_shmem_t *mem, void **buffer)

4
src/jdk.jdwp.agent/windows/native/libjdwp/proc_md.h
View File

@ -31,8 +31,8 @@
#define MUTEX_T int
#define MUTEX_INIT 0
#define MUTEX_LOCK(x) /* FIXUP? */
#define MUTEX_UNLOCK(x) /* FIXUP? */
#define MUTEX_LOCK(x) ((void) (x)) /* FIXUP? */
#define MUTEX_UNLOCK(x) ((void) (x)) /* FIXUP? */
#define GET_THREAD_ID() GetCurrentThreadId()
#define THREAD_T unsigned long
#define PID_T int

3
src/jdk.jpackage/windows/native/libjpackage/VersionInfo.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2024, 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
@ -180,7 +180,6 @@ void VersionInfo::fillBuffer(std::ostream& buf) const {
write(buf, createFIXEDFILEINFO()); // Value
add32bitPadding(buf); // Padding2
const DWORD neutralLangId = (0x04b0 | MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) << 16);
const DWORD engLangId = (0x04b0 | MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US) << 16);
do {