Skip to content

Commit a365ab6

Browse files
pass empty password
1 parent 2fd2f0a commit a365ab6

3 files changed

Lines changed: 10 additions & 5 deletions

File tree

dist/index.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58020,12 +58020,15 @@ async function importCertificate(keychainPath, tempCredential, certificateBase64
5802058020
await fs.promises.writeFile(certificatePath, certificate);
5802158021
const certArgs = [
5802258022
'import', certificatePath,
58023-
'-A', '-t', 'cert', '-f', 'pkcs12',
58024-
'-k', keychainPath
58023+
'-k', keychainPath,
58024+
'-A', '-t', 'cert', '-f', 'pkcs12'
5802558025
];
5802658026
if (certificatePassword && certificatePassword.length > 0) {
5802758027
certArgs.push('-P', certificatePassword);
5802858028
}
58029+
else {
58030+
certArgs.push('-P', '');
58031+
}
5802958032
await exec.exec(security, certArgs);
5803058033
const partitionList = 'apple-tool:,apple:,codesign:';
5803158034
if (core.isDebug()) {

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/AppleCredential.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,13 @@ async function importCertificate(keychainPath: string, tempCredential: string, c
252252
await fs.promises.writeFile(certificatePath, certificate);
253253
const certArgs = [
254254
'import', certificatePath,
255-
'-A', '-t', 'cert', '-f', 'pkcs12',
256-
'-k', keychainPath
255+
'-k', keychainPath,
256+
'-A', '-t', 'cert', '-f', 'pkcs12'
257257
];
258258
if (certificatePassword && certificatePassword.length > 0) {
259259
certArgs.push('-P', certificatePassword);
260+
} else {
261+
certArgs.push('-P', '');
260262
}
261263
await exec.exec(security, certArgs);
262264
const partitionList = 'apple-tool:,apple:,codesign:'; // : 'apple-tool:,apple:';

0 commit comments

Comments
 (0)