github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-09 14:08:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'GP-6074_ghidra1_ApplicationKeyManager' into Ghidra_12.0

Browse Source
This commit is contained in:
ghidra1
2025-11-03 13:04:38 -05:00
parent c1ee7f257a dc38d341b8
commit c0cc2ef540
1 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Ghidra/Framework/Generic/src/main/java/ghidra/net/ApplicationKeyStore.java
View File

@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,7 +32,7 @@ import ghidra.util.Msg;
* X.509 form (*.pem, *.crt, *.cer, *.der) or Java JKS (*.jks) form, while keystores
* for client/server may be in a PKCS12 form (*.p12, *.pks, *.pfx) or Java JKS (*.jks) form.
*/
class ApplicationKeyStore {
public class ApplicationKeyStore {
private ApplicationKeyStore() {
// no instantiation - static methods only
@@ -48,7 +48,7 @@ class ApplicationKeyStore {
* @throws NoSuchAlgorithmException
* @throws CertificateException
*/
static KeyStore getCertificateStoreInstance(String cacertsPath)
public static KeyStore getCertificateStoreInstance(String cacertsPath)
throws IOException, KeyStoreException, NoSuchAlgorithmException, CertificateException {
int certCount = 0;
@@ -103,7 +103,7 @@ class ApplicationKeyStore {
* @throws NoSuchAlgorithmException
* @throws CertificateException
*/
static KeyStore getKeyStoreInstance(String keystorePath, char[] pwd)
public static KeyStore getKeyStoreInstance(String keystorePath, char[] pwd)
throws IOException, KeyStoreException, NoSuchAlgorithmException, CertificateException {
File keystoreFile = new File(keystorePath);
@@ -122,6 +122,35 @@ class ApplicationKeyStore {
return ks;
}
/**
* Attempt to detect PKI KeyStore type ("JKS" or "PKCS12") for the specified file.
* @param keystorePath key store file path
* @return "JKS", "PKCS12" or null
* @throws IOException if file read error occurs
*/
public static String detectKeyStoreType(String keystorePath) throws IOException {
try (FileInputStream fis = new FileInputStream(keystorePath)) {
byte[] header = new byte[4];
int read = fis.read(header);
if (read < 4) {
return null;
}
// Check for JKS magic number: FEEDFEED
if ((header[0] & 0xFF) == 0xFE && (header[1] & 0xFF) == 0xED &&
(header[2] & 0xFF) == 0xFE && (header[3] & 0xFF) == 0xED) {
return "JKS";
}
// Check for PKCS12: starts with 0x30 0x82
if ((header[0] & 0xFF) == 0x30 && (header[1] & 0xFF) == 0x82) {
return "PKCS12";
}
return null;
}
}
/**
* Extract Common Name (CN) from specified principal subject Distinguished Name (DN)
* @param subject X.509 certificate subject
@@ -180,7 +209,7 @@ class ApplicationKeyStore {
* Log all X509 certificates contained within array
* @param x509Certs array of certificates
*/
static void logCerts(X509Certificate[] x509Certs) {
public static void logCerts(X509Certificate[] x509Certs) {
for (X509Certificate x509Cert : x509Certs) {
logCert(null, x509Cert);
}