diff options
| author | Fraser Tweedale <ftweedal@redhat.com> | 2017-06-15 12:38:26 +1000 |
|---|---|---|
| committer | Fraser Tweedale <ftweedal@redhat.com> | 2017-06-16 09:52:39 +1000 |
| commit | a411492fe5ad2030bb9f18db9a8ed8d1c45ee7de (patch) | |
| tree | 3a67cac3c933be55c37b0a675674a88402fe5d2d /base/server/python | |
| parent | 63c9582009b3858a6878863b9658d04c9aad45c1 (diff) | |
| download | pki-a411492fe5ad2030bb9f18db9a8ed8d1c45ee7de.tar.gz pki-a411492fe5ad2030bb9f18db9a8ed8d1c45ee7de.tar.xz pki-a411492fe5ad2030bb9f18db9a8ed8d1c45ee7de.zip | |
Fix regression in pkcs12 key bag creation
Commit 633c7c6519c925af7e3700adff29961d72435c7f changed the PKCS #12
file handing to never deal with raw private key material.
PKCS12Util.addKeyBag() was changed to export the PrivateKey handle,
or fail. This change missed this case where a PKCS #12 file is
loaded from file, possibly modified, then written back to a file,
without involving an NSSDB. One example is pkcs12-cert-del which
deletes a certificate and associated key from a PKCS #12 file.
Fix the PKCS12Util.addKeyBag() method to use the stored
EncryptedPricateKeyInfo if available, otherwise export the
PrivateKey handle.
Fixes: https://pagure.io/dogtagpki/issue/2741
Change-Id: Ib8098126bc5a79b5dae19103e25b270e2f10ab5a
Diffstat (limited to 'base/server/python')
0 files changed, 0 insertions, 0 deletions