security: make some functions static in BackEndOsx, simplify KeyHandleOsx
Change-Id: I178a5fe4bbffe6a5337b546653a90724f3ef41f5
Refs: #4075
diff --git a/src/security/tpm/key-handle-osx.cpp b/src/security/tpm/key-handle-osx.cpp
index 518a673..05e7023 100644
--- a/src/security/tpm/key-handle-osx.cpp
+++ b/src/security/tpm/key-handle-osx.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2017 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -26,9 +26,8 @@
namespace security {
namespace tpm {
-KeyHandleOsx::KeyHandleOsx(const BackEndOsx& impl, const KeyRefOsx& key)
- : m_impl(impl)
- , m_key(key)
+KeyHandleOsx::KeyHandleOsx(const KeyRefOsx& key)
+ : m_key(key)
{
if (m_key.get() == 0)
BOOST_THROW_EXCEPTION(Error("key is not set"));
@@ -37,19 +36,19 @@
ConstBufferPtr
KeyHandleOsx::doSign(DigestAlgorithm digestAlgorithm, const uint8_t* buf, size_t size) const
{
- return m_impl.sign(m_key, digestAlgorithm, buf, size);
+ return BackEndOsx::sign(m_key, digestAlgorithm, buf, size);
}
ConstBufferPtr
KeyHandleOsx::doDecrypt(const uint8_t* cipherText, size_t cipherTextLen) const
{
- return m_impl.decrypt(m_key, cipherText, cipherTextLen);
+ return BackEndOsx::decrypt(m_key, cipherText, cipherTextLen);
}
ConstBufferPtr
KeyHandleOsx::doDerivePublicKey() const
{
- return m_impl.derivePublicKey(m_key);
+ return BackEndOsx::derivePublicKey(m_key);
}
} // namespace tpm