Skip to content

Commit

Permalink
Update file extensions in pemfilefactory and fix typo in documentation
Browse files Browse the repository at this point in the history
- Changed output file extension from .pem to .crt in pemfilefactory.cpp
- Fixed syntax in documentation by escaping dollar sign for shell script commands in securepva.rst
  • Loading branch information
george-mcintyre committed Dec 3, 2024
1 parent 3720e03 commit 25f3517
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions certs/pemfilefactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ bool PEMFileFactory::createRootPemFile(const std::string& p12PemString, bool ove

std::string fileName(cn);
std::replace(fileName.begin(), fileName.end(), ' ', '_');
fileName += ".pem";
fileName += ".crt";

// Prepare file to write
std::string certs_directory_string = CertFactory::getCertsDirectory();
Expand Down Expand Up @@ -173,7 +173,7 @@ void PEMFileFactory::writePEMFile() {
if (!password_.empty()) {
// Write encrypted private key using PKCS8 format
const EVP_CIPHER* cipher = EVP_aes_256_cbc();
if (PEM_write_PKCS8PrivateKey(fp.get(),
if (PEM_write_PKCS8PrivateKey(fp.get(),
key_pair_->pkey.get(),
cipher,
nullptr, 0,
Expand All @@ -183,7 +183,7 @@ void PEMFileFactory::writePEMFile() {
}
} else {
// Write unencrypted private key
if (PEM_write_PrivateKey(fp.get(),
if (PEM_write_PrivateKey(fp.get(),
key_pair_->pkey.get(),
nullptr, nullptr, 0,
nullptr, nullptr) != 1) {
Expand Down
4 changes: 2 additions & 2 deletions documentation/securepva.rst
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Quick Start Guide
.. code-block:: sh
cat >> RELEASE.local <<EOF
EPICS_BASE = $(TOP)/../epics-base
EPICS_BASE = \$(TOP)/../epics-base
EOF
# Optional: To enable appropriate site authentication mechanisms.
Expand Down Expand Up @@ -139,7 +139,7 @@ Quick Start Guide
# Build PVXS
? make -j10 all
make -j10 all
5. PVACMS Setup
^^^^^^^^^^^^^^^
Expand Down

0 comments on commit 25f3517

Please sign in to comment.