Skip to content

ignore / don't try to export the dash (-) identity #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 22, 2016
Merged

ignore / don't try to export the dash (-) identity #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c93e331
ignore / don't try to export the dash (-) identity
viktorbenei Nov 22, 2016
a4bb6f3
go lint fix
viktorbenei Nov 22, 2016
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
10 changes: 9 additions & 1 deletion cmd/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,17 @@ func exportCodeSigningFiles(toolName, absExportOutputDirPath string, codeSigning
fmt.Println()
fmt.Println()
utils.Printlnf("=== Required Identities/Certificates (%d) ===", len(codeSigningSettings.Identities))
cleanedUpIdentities := []common.CodeSigningIdentityInfo{}
for idx, anIdentity := range codeSigningSettings.Identities {
utils.Printlnf(" * (%d): %s", idx+1, anIdentity.Title)
if anIdentity.Title == "-" {
fmt.Println(" " + colorstring.Yellow("WARNING:") + " This entry (" + colorstring.Yellow("-") + ") means that one of your target/project is set to " + colorstring.Yellow("NO CODE SIGN"))
fmt.Println(" Please try to fix this issue first if you'd experience any code signing problems!")
} else {
cleanedUpIdentities = append(cleanedUpIdentities, anIdentity)
}
}
codeSigningSettings.Identities = cleanedUpIdentities
fmt.Println("============================================")

fmt.Println()
Expand Down Expand Up @@ -228,7 +236,7 @@ func collectAndExportIdentities(codeSigningSettings common.CodeSigningSettings,
}

if len(validIdentityRefs) < 1 {
return errors.New("Identity not found in the keychain, or it was invalid (expired)!")
return errors.New("Identity not found in the keychain, or it was invalid (expired)")
}
if len(validIdentityRefs) > 1 {
log.Warning(colorstring.Yellow("Multiple matching Identities found in Keychain! Most likely you have duplicated identities in separate Keychains, e.g. one in System.keychain and one in your Login.keychain, or you have revoked versions of the Certificate."))
Expand Down
2 changes: 1 addition & 1 deletion osxkeychain/osxkeychain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ func FindIdentity(identityLabel string, isFullLabelMatch bool) ([]IdentityWithRe
identitiesArrRef := C.CFArrayRef(resultRefs)
identitiesCount := C.CFArrayGetCount(identitiesArrRef)
if identitiesCount < 1 {
return nil, fmt.Errorf("No Identity (certificate + related private key) found in your Keychain!")
return nil, fmt.Errorf("No Identity (certificate + related private key) found in your Keychain")
}
log.Debugf("identitiesCount: %d", identitiesCount)

Expand Down