Skip to content
This repository has been archived by the owner on Mar 28, 2023. It is now read-only.

Commit

Permalink
Add encrypted certs
Browse files Browse the repository at this point in the history
Add Travis encrypted certs

Remove old certs

Update build.sh

Update cert locations

Update pvk and spc

Update certs

Remove encrypted certs

Put encrypted tar file of certs

Fix decryption of certs tar

Remove pvk

Untar correct folder

Change directory to untar files

Update encrypted certs tar

Remove passcode requirement

Update certs

Update certs

Change cert password

Make it the Apple Dev cert instead

Update signing identity

Update certs

Revert electron-packager issues

Updates

Update libs

revert change

Fix cert paths
  • Loading branch information
hoffmabc committed Mar 20, 2020
1 parent caf1924 commit d04c4e2
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 196 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ addons:
packages:
- fakeroot
before_script:
- if [[ -n "$TRAVIS_TAG" ]]; then cp ./.travis/ob1.pvk ./.travis/ob1.keyfile; fi
- if [[ -n "$TRAVIS_TAG" ]]; then openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in .travis/cert.p12.enc -d -a -out ./.travis/cert.p12; fi
- if [[ -n "$TRAVIS_TAG" ]]; then openssl aes-256-cbc -k "$OB1_SECRET" -in .travis/ob1.cert.spc.enc -d -a -out ./.travis/ob1.cert.spc; fi
- if [[ -n "$TRAVIS_TAG" ]]; then openssl aes-256-cbc -k "$OB1_SECRET" -in .travis/ob1.cert.spc.enc -d -a -out ./.travis/ob1.pvk; fi
#- if [[ -n "$TRAVIS_TAG" ]]; then cp ./.travis/ob1.pvk ./.travis/ob1.keyfile; fi
- if [[ -n "$TRAVIS_TAG" ]]; then openssl aes-256-cbc -K $encrypted_c8b4b5b5a834_key -iv $encrypted_c8b4b5b5a834_iv -in ./.travis/certs.tar.enc -out ./.travis/certs.tar -d; fi
- if [[ -n "$TRAVIS_TAG" ]]; then tar xvf ./.travis/certs.tar -C ./.travis; fi
- if [[ -n "$TRAVIS_TAG" ]]; then if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then "./.travis/add-key.sh"; fi ; fi
jobs:
include:
Expand Down
2 changes: 1 addition & 1 deletion .travis/add-key.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ security set-keychain-settings -t 3600 -l ~/Library/Keychains/osx-build.keychain

# Add certificates to keychain and allow codesign to access them
security import ./.travis/AppleWWDRCA.cer -k ~/Library/Keychains/osx-build.keychain -T /usr/bin/codesign
security import ./.travis/cert.p12 -k ~/Library/Keychains/osx-build.keychain -P $KEY_PASSWORD -T /usr/bin/codesign
security import ./.travis/cert.p12 -k ~/Library/Keychains/osx-build.keychain -P $CERTS_PASSWORD -T /usr/bin/codesign

security set-key-partition-list -S apple-tool:,apple: -s -k travis osx-build.keychain > /dev/null
67 changes: 0 additions & 67 deletions .travis/cert.p12.enc

This file was deleted.

Binary file added .travis/certs.tar.enc
Binary file not shown.
Binary file removed .travis/ob1.cert.spc
Binary file not shown.
77 changes: 0 additions & 77 deletions .travis/ob1.cert.spc.enc

This file was deleted.

Binary file removed .travis/ob1.pvk
Binary file not shown.
26 changes: 0 additions & 26 deletions .travis/ob1.pvk.enc

This file was deleted.

2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ module.exports = function (grunt) {
description: `${grunt.option('appname')}`,
version: grunt.option('obversion') || '',
title: 'OpenBazaar',
iconUrl: 'https://www.openbazaar.org/wp-content/uploads/2017/07/windows-icon.ico',
iconUrl: 'http://openbazaar.org/assets/windows-icon.ico',
setupIcon: 'imgs/windows-icon.ico',
skipUpdateIcon: true,
loadingGif: 'imgs/windows-loading.gif',
Expand Down
Loading

0 comments on commit d04c4e2

Please sign in to comment.