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

Unified Diff: content/renderer/webcrypto/webcrypto_impl_nss.cc

Issue 25906002: [webcrypto] Add JWK import for HMAC and AES-CBC key. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed a change from last upload Created 7 years 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
« no previous file with comments | « content/renderer/webcrypto/webcrypto_impl.cc ('k') | content/renderer/webcrypto/webcrypto_impl_openssl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/webcrypto/webcrypto_impl_nss.cc
diff --git a/content/renderer/webcrypto/webcrypto_impl_nss.cc b/content/renderer/webcrypto/webcrypto_impl_nss.cc
index bf6fcdac8179fcba8f65c315b3ee54ed6803d62b..42dfc334d6907bbafad0c49c234f912b25352cb4 100644
--- a/content/renderer/webcrypto/webcrypto_impl_nss.cc
+++ b/content/renderer/webcrypto/webcrypto_impl_nss.cc
@@ -11,6 +11,7 @@
#include <vector>
#include "base/logging.h"
+#include "content/renderer/webcrypto/webcrypto_util.h"
#include "crypto/nss_util.h"
#include "crypto/scoped_nss_types.h"
#include "crypto/secure_util.h"
@@ -170,7 +171,7 @@ bool AesCbcEncryptDecrypt(
return false;
}
- WebCryptoImpl::ShrinkBuffer(buffer, final_output_chunk_len + output_len);
+ webcrypto::ShrinkBuffer(buffer, final_output_chunk_len + output_len);
return true;
}
@@ -584,7 +585,7 @@ bool WebCryptoImpl::DecryptInternal(
return false;
}
DCHECK_LE(output_length_bytes, max_output_length_bytes);
- WebCryptoImpl::ShrinkBuffer(buffer, output_length_bytes);
+ webcrypto::ShrinkBuffer(buffer, output_length_bytes);
return true;
}
« no previous file with comments | « content/renderer/webcrypto/webcrypto_impl.cc ('k') | content/renderer/webcrypto/webcrypto_impl_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698