ndnsec: improve error reporting when loading a Certificate or SafeBag fails
Refs: #5164
Change-Id: I6f594a921bb063ad808f311d8ff978bf0f7d528d
diff --git a/tools/ndnsec/cert-gen.cpp b/tools/ndnsec/cert-gen.cpp
index 9c11ca4..8772062 100644
--- a/tools/ndnsec/cert-gen.cpp
+++ b/tools/ndnsec/cert-gen.cpp
@@ -124,14 +124,7 @@
KeyChain keyChain;
- security::Certificate certRequest;
- try {
- certRequest = loadCertificate(requestFile);
- }
- catch (const CannotLoadCertificate&) {
- std::cerr << "ERROR: Cannot load the request from `" << requestFile << "`" << std::endl;
- return 1;
- }
+ auto certRequest = loadFromFile<security::Certificate>(requestFile);
// validate that the content is a public key
Buffer keyContent = certRequest.getPublicKey();
@@ -165,9 +158,9 @@
keyChain.sign(cert, security::SigningInfo(identity).setSignatureInfo(signatureInfo));
- const Block& wire = cert.wireEncode();
{
using namespace security::transform;
+ const auto& wire = cert.wireEncode();
bufferSource(wire.wire(), wire.size()) >> base64Encode(true) >> streamSink(std::cout);
}