diff options
author | Rob Mensching <rob@firegiant.com> | 2021-04-11 14:41:50 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2021-04-12 15:37:24 -0700 |
commit | 3e8b7eb4cb739be1881c621999616bc5bbbb0bdb (patch) | |
tree | 1e6588300f94b85bc62dce1dfe62c78598141581 /src/ca/scacert.cpp | |
parent | 1656cd76e95e78b09d1fd9724c0c02323b5c3428 (diff) | |
download | wix-3e8b7eb4cb739be1881c621999616bc5bbbb0bdb.tar.gz wix-3e8b7eb4cb739be1881c621999616bc5bbbb0bdb.tar.bz2 wix-3e8b7eb4cb739be1881c621999616bc5bbbb0bdb.zip |
Support non-vital certificate installs
Diffstat (limited to 'src/ca/scacert.cpp')
-rw-r--r-- | src/ca/scacert.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/ca/scacert.cpp b/src/ca/scacert.cpp index cf979ee7..5eae905a 100644 --- a/src/ca/scacert.cpp +++ b/src/ca/scacert.cpp | |||
@@ -244,7 +244,7 @@ static HRESULT ConfigureCertificates( | |||
244 | ExitOnFailure(hr, "Failed to pass Certificate.Certificate to deferred CustomAction."); | 244 | ExitOnFailure(hr, "Failed to pass Certificate.Certificate to deferred CustomAction."); |
245 | hr = WcaWriteStringToCaData(pwzStoreName, &pwzCaData); | 245 | hr = WcaWriteStringToCaData(pwzStoreName, &pwzCaData); |
246 | ExitOnFailure(hr, "Failed to pass Certificate.StoreName to deferred CustomAction."); | 246 | ExitOnFailure(hr, "Failed to pass Certificate.StoreName to deferred CustomAction."); |
247 | hr = WcaWriteIntegerToCaData(SCA_CERT_ATTRIBUTE_BINARYDATA, &pwzCaData); | 247 | hr = WcaWriteIntegerToCaData(dwAttributes, &pwzCaData); |
248 | ExitOnFailure(hr, "Failed to pass Certificate.Attributes to deferred CustomAction."); | 248 | ExitOnFailure(hr, "Failed to pass Certificate.Attributes to deferred CustomAction."); |
249 | 249 | ||
250 | // Copy the rollback data from the deferred data because it's the same up to this point. | 250 | // Copy the rollback data from the deferred data because it's the same up to this point. |
@@ -268,6 +268,9 @@ static HRESULT ConfigureCertificates( | |||
268 | 268 | ||
269 | hr = WcaWriteStringToCaData(pwzPFXPassword, &pwzRollbackCaData); | 269 | hr = WcaWriteStringToCaData(pwzPFXPassword, &pwzRollbackCaData); |
270 | ExitOnFailure(hr, "Failed to pass Certificate.PFXPassword to rollback CustomAction."); | 270 | ExitOnFailure(hr, "Failed to pass Certificate.PFXPassword to rollback CustomAction."); |
271 | |||
272 | hr = WcaWriteIntegerToCaData(dwAttributes, &pwzCaData); | ||
273 | ExitOnFailure(hr, "Failed to pass Certificate.Attributes to deferred CustomAction."); | ||
271 | } | 274 | } |
272 | 275 | ||
273 | // Pick the right action to run based on what store we're uninstalling from. | 276 | // Pick the right action to run based on what store we're uninstalling from. |