Skip to content
Open
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
11 changes: 9 additions & 2 deletions truststore_java.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ import (
)

var (
hasJava bool
hasKeytool bool
hasJava bool
hasKeytool bool
hasCAcertsPath bool

javaHome string
cacertsPath string
Expand All @@ -45,10 +46,12 @@ func init() {
}

if pathExists(filepath.Join(v, "lib", "security", "cacerts")) {
hasCAcertsPath = true
cacertsPath = filepath.Join(v, "lib", "security", "cacerts")
}

if pathExists(filepath.Join(v, "jre", "lib", "security", "cacerts")) {
hasCAcertsPath = true
cacertsPath = filepath.Join(v, "jre", "lib", "security", "cacerts")
}
}
Expand All @@ -59,6 +62,10 @@ func (m *mkcert) checkJava() bool {
return false
}

if !hasCAcertsPath {
return false
}

// exists returns true if the given x509.Certificate's fingerprint
// is in the keytool -list output
exists := func(c *x509.Certificate, h hash.Hash, keytoolOutput []byte) bool {
Expand Down