security: Correct KeyChain::addCertificate semantics
The documentation of KeyChain::addCertificate was ambiguous. On the one
hand, it stated that the certificate with the same name will be
overwritten. On the other hand, it stated that it will thrown an
exception if certificate with the same name exists. This commit ensures
the former behavior, which is consistent with the old KeyChain.
Change-Id: I911f7c86c634caf260ecb9a5dbdf13b066f8711f
diff --git a/src/security/pib/detail/key-impl.cpp b/src/security/pib/detail/key-impl.cpp
index 35a0de6..c0cd839 100644
--- a/src/security/pib/detail/key-impl.cpp
+++ b/src/security/pib/detail/key-impl.cpp
@@ -39,15 +39,11 @@
{
BOOST_ASSERT(impl != nullptr);
- if (m_impl->hasKey(m_keyName)) {
- BOOST_THROW_EXCEPTION(Pib::Error("Cannot overwrite existing key " + m_keyName.toUri()));
- }
-
transform::PublicKey publicKey;
try {
publicKey.loadPkcs8(key, keyLen);
}
- catch (transform::PublicKey::Error&) {
+ catch (const transform::PublicKey::Error&) {
BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid key bits"));
}
m_keyType = publicKey.getKeyType();
@@ -75,11 +71,6 @@
KeyImpl::addCertificate(const v2::Certificate& certificate)
{
BOOST_ASSERT(m_certificates.isConsistent());
-
- if (m_certificates.find(certificate.getName()) != m_certificates.end()) {
- BOOST_THROW_EXCEPTION(Pib::Error("Cannot overwrite existing certificate " + certificate.getName().toUri()));
- }
-
m_certificates.add(certificate);
}