| Index: base/crypto/symmetric_key_mac.cc
|
| ===================================================================
|
| --- base/crypto/symmetric_key_mac.cc (revision 43766)
|
| +++ base/crypto/symmetric_key_mac.cc (working copy)
|
| @@ -29,7 +29,7 @@
|
| return CSSM_ALGID_SHA1HMAC_LEGACY;
|
| }
|
| }
|
| -
|
| +
|
| void* CreateRandomBytes(size_t size) {
|
| CSSM_RETURN err;
|
| CSSM_CC_HANDLE ctx;
|
| @@ -49,8 +49,8 @@
|
| }
|
| CSSM_DeleteContext(ctx);
|
| return random_data.Data; // Caller responsible for freeing this
|
| -}
|
| -
|
| +}
|
| +
|
| inline CSSM_DATA StringToData(const std::string& str) {
|
| CSSM_DATA data = {
|
| str.size(),
|
| @@ -63,6 +63,8 @@
|
|
|
| namespace base {
|
|
|
| +SymmetricKey::~SymmetricKey() {}
|
| +
|
| // static
|
| SymmetricKey* SymmetricKey::GenerateRandomKey(Algorithm algorithm,
|
| size_t key_size_in_bits) {
|
| @@ -123,7 +125,7 @@
|
| DCHECK_EQ(cssm_key.KeyData.Length, key_size_in_bits / 8);
|
| derived_key = new SymmetricKey(cssm_key.KeyData.Data, key_size_in_bits);
|
|
|
| -exit:
|
| + exit:
|
| CSSM_DeleteContext(ctx);
|
| CSSM_FreeKey(GetSharedCSPHandle(), &credentials, &cssm_key, false);
|
| return derived_key;
|
|
|