diff options
author | Krzysztof Jackiewicz <k.jackiewicz@samsung.com> | 2015-01-21 14:33:01 +0100 |
---|---|---|
committer | Maciej J. Karpiuk <m.karpiuk2@samsung.com> | 2015-02-17 12:02:44 +0100 |
commit | aa13e46d4f930099d0d6583efeb45bfb8f5b7e4b (patch) | |
tree | 30f2cf91c584e6d2b3797eb6114fdb41221e8343 | |
parent | a87b86542dc1a1dc5d519a2d3e1a8065e672164a (diff) | |
download | key-manager-aa13e46d4f930099d0d6583efeb45bfb8f5b7e4b.tar.gz key-manager-aa13e46d4f930099d0d6583efeb45bfb8f5b7e4b.tar.bz2 key-manager-aa13e46d4f930099d0d6583efeb45bfb8f5b7e4b.zip |
Remove deprecated C++ API for certificate chains
[Issue#] N/A
[Feature/Bug] N/A
[Problem] Old C++ certificate chain API is no longer necessary
[Cause] N/A
[Solution] API removed
[Verification] Successfull tests compilation
Change-Id: I588a99d1d211607dcd70290b9b0610b4732d8ef0
-rw-r--r-- | src/include/ckm/ckm-manager-async.h | 8 | ||||
-rw-r--r-- | src/include/ckm/ckm-manager.h | 10 | ||||
-rw-r--r-- | src/manager/client-async/client-manager-async.cpp | 26 | ||||
-rw-r--r-- | src/manager/client/client-manager-impl.cpp | 27 | ||||
-rw-r--r-- | src/manager/client/client-manager-impl.h | 10 |
5 files changed, 0 insertions, 81 deletions
diff --git a/src/include/ckm/ckm-manager-async.h b/src/include/ckm/ckm-manager-async.h index 38be6969..6978aaaf 100644 --- a/src/include/ckm/ckm-manager-async.h +++ b/src/include/ckm/ckm-manager-async.h @@ -143,14 +143,6 @@ public: void getCertificateChain( const ObserverPtr& observer, const CertificateShPtr& certificate, - const CertificateShPtrVector& untrustedCertificates); - void getCertificateChain( - const ObserverPtr& observer, - const CertificateShPtr& certificate, - const AliasVector& untrustedCertificates); - void getCertificateChain( - const ObserverPtr& observer, - const CertificateShPtr& certificate, const CertificateShPtrVector& untrustedCertificates, const CertificateShPtrVector& trustedCertificates, bool useSystemTrustedCertificates); diff --git a/src/include/ckm/ckm-manager.h b/src/include/ckm/ckm-manager.h index 7100eaa4..bf633a66 100644 --- a/src/include/ckm/ckm-manager.h +++ b/src/include/ckm/ckm-manager.h @@ -93,16 +93,6 @@ public: virtual int getCertificateChain( const CertificateShPtr &certificate, const CertificateShPtrVector &untrustedCertificates, - CertificateShPtrVector &certificateChainVector) = 0; - - virtual int getCertificateChain( - const CertificateShPtr &certificate, - const AliasVector &untrustedCertificates, - CertificateShPtrVector &certificateChainVector) = 0; - - virtual int getCertificateChain( - const CertificateShPtr &certificate, - const CertificateShPtrVector &untrustedCertificates, const CertificateShPtrVector &trustedCertificates, bool useTrustedSystemCertificates, CertificateShPtrVector &certificateChainVector) = 0; diff --git a/src/manager/client-async/client-manager-async.cpp b/src/manager/client-async/client-manager-async.cpp index 18223d66..e5e51477 100644 --- a/src/manager/client-async/client-manager-async.cpp +++ b/src/manager/client-async/client-manager-async.cpp @@ -43,8 +43,6 @@ LabelNameVector toLabelNameVector(const AliasVector& aliases) } return labelNames; } -const RawBufferVector EMPTY_CERT_VECTOR; -const LabelNameVector EMPTY_ALIAS_VECTOR; } // namespace anonymous @@ -186,30 +184,6 @@ void ManagerAsync::createKeyPairECDSA(const ObserverPtr& observer, void ManagerAsync::getCertificateChain(const ObserverPtr& observer, const CertificateShPtr& certificate, - const CertificateShPtrVector& untrustedCertificates) -{ - m_impl->getCertChain(observer, - LogicCommand::GET_CHAIN_CERT, - certificate, - toRawBufferVector(untrustedCertificates), - EMPTY_CERT_VECTOR, - true); -} - -void ManagerAsync::getCertificateChain(const ObserverPtr& observer, - const CertificateShPtr& certificate, - const AliasVector& untrustedCertificates) -{ - m_impl->getCertChain(observer, - LogicCommand::GET_CHAIN_ALIAS, - certificate, - toLabelNameVector(untrustedCertificates), - EMPTY_ALIAS_VECTOR, - true); -} - -void ManagerAsync::getCertificateChain(const ObserverPtr& observer, - const CertificateShPtr& certificate, const CertificateShPtrVector& untrustedCertificates, const CertificateShPtrVector& trustedCertificates, bool useSystemTrustedCertificates) diff --git a/src/manager/client/client-manager-impl.cpp b/src/manager/client/client-manager-impl.cpp index 0fa3a22c..078ea489 100644 --- a/src/manager/client/client-manager-impl.cpp +++ b/src/manager/client/client-manager-impl.cpp @@ -83,9 +83,6 @@ int getCertChain( }); } -const CertificateShPtrVector EMPTY_CERT_VECTOR; -const AliasVector EMPTY_ALIAS_VECTOR; - } // namespace anonymous ManagerImpl::ManagerImpl() @@ -516,30 +513,6 @@ int ManagerImpl::createKeyPair( int ManagerImpl::getCertificateChain( const CertificateShPtr &certificate, const CertificateShPtrVector &untrustedCertificates, - CertificateShPtrVector &certificateChainVector) -{ - return getCertificateChain(certificate, - untrustedCertificates, - EMPTY_CERT_VECTOR, - true, - certificateChainVector); -} - -int ManagerImpl::getCertificateChain( - const CertificateShPtr &certificate, - const AliasVector &untrustedCertificates, - CertificateShPtrVector &certificateChainVector) -{ - return getCertificateChain(certificate, - untrustedCertificates, - EMPTY_ALIAS_VECTOR, - true, - certificateChainVector); -} - -int ManagerImpl::getCertificateChain( - const CertificateShPtr &certificate, - const CertificateShPtrVector &untrustedCertificates, const CertificateShPtrVector &trustedCertificates, bool useTrustedSystemCertificates, CertificateShPtrVector &certificateChainVector) diff --git a/src/manager/client/client-manager-impl.h b/src/manager/client/client-manager-impl.h index e2e117b7..bf6d2794 100644 --- a/src/manager/client/client-manager-impl.h +++ b/src/manager/client/client-manager-impl.h @@ -79,16 +79,6 @@ public: int getCertificateChain( const CertificateShPtr &certificate, const CertificateShPtrVector &untrustedCertificates, - CertificateShPtrVector &certificateChainVector); - - int getCertificateChain( - const CertificateShPtr &certificate, - const AliasVector &untrustedCertificates, - CertificateShPtrVector &certificateChainVector); - - int getCertificateChain( - const CertificateShPtr &certificate, - const CertificateShPtrVector &untrustedCertificates, const CertificateShPtrVector &trustedCertificates, bool useTrustedSystemCertificates, CertificateShPtrVector &certificateChainVector); |