commit f12ee3011f2cd3a33ba4e7822a364356343a7b78
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Wed Oct 14 17:46:44 2020 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Wed Oct 14 17:46:44 2020 -0700
tree 54639ce08745e1aa366bef190acfe2545bee944c
parent c2c4ed2f01e6a068bb10dc55a494915da33b77ed

use HKDF from openSSL

Change-Id: Iade1523bc46ac44b9b5540cdd91b9283ac537a31

src/ca-module.cpp

diff --git a/src/ca-module.cpp b/src/ca-module.cpp
index b5b257e..eae209e 100644
--- a/src/ca-module.cpp
+++ b/src/ca-module.cpp
@@ -292,7 +292,15 @@
   // create new request instance
   uint8_t requestIdData[32];
   Block certNameTlv = clientCert->getName().wireEncode();
-  hmac_sha256(certNameTlv.wire(), certNameTlv.size(), m_requestIdGenKey, 32, requestIdData);
+  try {
+    hmac_sha256(certNameTlv.wire(), certNameTlv.size(), m_requestIdGenKey, 32, requestIdData);
+  }
+  catch (const std::runtime_error& e) {
+    NDN_LOG_ERROR("Error computing the request ID: " << std::string(e.what()));
+    m_face.put(generateErrorDataPacket(request.getName(), ErrorCode::INVALID_PARAMETER,
+                                       "Error computing the request ID."));
+    return;
+  }
   CaState requestState(m_config.m_caItem.m_caPrefix, toHex(requestIdData, 32),
                        requestType, Status::BEFORE_CHALLENGE, *clientCert,
                        makeBinaryBlock(ndn::tlv::ContentType_Key, aesKey, sizeof(aesKey)));
@@ -302,7 +310,7 @@
   catch (const std::runtime_error& e) {
     NDN_LOG_ERROR("Duplicate Request ID: The same request has been seen before.");
     m_face.put(generateErrorDataPacket(request.getName(), ErrorCode::INVALID_PARAMETER,
-                                       "Duplicate Request ID: The same request has been seen before.."));
+                                       "Duplicate Request ID: The same request has been seen before."));
     return;
   }
   Data result;