Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1836)

Unified Diff: base/crypto/signature_creator_mac.cc

Issue 1347002: Add Mac implementations of new SymmetricKey and Encryptor classes. (Closed)
Patch Set: Responding to feedback Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/crypto/signature_creator_mac.cc
diff --git a/base/crypto/signature_creator_mac.cc b/base/crypto/signature_creator_mac.cc
index ee0ca05c0cb6665779ebc6622b6fa37038e490b5..f96b1d4ef206935caff08d0620690b917ffe134a 100644
--- a/base/crypto/signature_creator_mac.cc
+++ b/base/crypto/signature_creator_mac.cc
@@ -18,7 +18,7 @@ SignatureCreator* SignatureCreator::Create(RSAPrivateKey* key) {
result->key_ = key;
CSSM_RETURN crtn;
- crtn = CSSM_CSP_CreateSignatureContext(result->csp_handle_,
+ crtn = CSSM_CSP_CreateSignatureContext(GetSharedCSPHandle(),
CSSM_ALGID_SHA1WithRSA,
NULL,
key->key(),
@@ -37,15 +37,8 @@ SignatureCreator* SignatureCreator::Create(RSAPrivateKey* key) {
return result.release();
}
-SignatureCreator::SignatureCreator() : csp_handle_(0), sig_handle_(0) {
+SignatureCreator::SignatureCreator() : sig_handle_(0) {
EnsureCSSMInit();
-
- static CSSM_VERSION version = {2, 0};
- CSSM_RETURN crtn;
- crtn = CSSM_ModuleAttach(&gGuidAppleCSP, &version, &kCssmMemoryFunctions, 0,
- CSSM_SERVICE_CSP, 0, CSSM_KEY_HIERARCHY_NONE,
- NULL, 0, NULL, &csp_handle_);
- DCHECK(crtn == CSSM_OK);
}
SignatureCreator::~SignatureCreator() {
@@ -54,11 +47,6 @@ SignatureCreator::~SignatureCreator() {
crtn = CSSM_DeleteContext(sig_handle_);
DCHECK(crtn == CSSM_OK);
}
-
- if (csp_handle_) {
- CSSM_RETURN crtn = CSSM_ModuleDetach(csp_handle_);
- DCHECK(crtn == CSSM_OK);
- }
}
bool SignatureCreator::Update(const uint8* data_part, int data_part_len) {

Powered by Google App Engine
This is Rietveld 408576698