diff options
| author | Renato Botelho <renato@netgate.com> | 2017-03-02 16:29:20 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-03-02 16:29:20 -0300 |
| commit | 75c91268366a4dcc136b817e60292716bccc52b2 (patch) | |
| tree | 5d0d8b35f17bca3d23ef31c5cd81b0a0c28750a5 | |
| parent | f19d785f4dfd5b9d0aa80c9ea0af7b72afd65cd6 (diff) | |
| parent | 7fd7fbcff3304285f4407bec2ae62bab7195bcc4 (diff) | |
| download | pfsense-75c91268366a4dcc136b817e60292716bccc52b2.zip pfsense-75c91268366a4dcc136b817e60292716bccc52b2.tar.gz | |
Merge pull request #3586 from PiBa-NL/certificatemanager-csr-calink
| -rw-r--r-- | src/etc/inc/certs.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/etc/inc/certs.inc b/src/etc/inc/certs.inc index 248019e..4da7543 100644 --- a/src/etc/inc/certs.inc +++ b/src/etc/inc/certs.inc @@ -427,11 +427,9 @@ function csr_generate(& $cert, $keylen, $dn, $digest_alg = "sha256") { } function csr_complete(& $cert, $str_crt) { - - // return our request information - $cert['crt'] = base64_encode($str_crt); + $str_key = base64_decode($cert['prv']); + cert_import($cert, $str_crt, $str_key); unset($cert['csr']); - return true; } |
