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

Unified Diff: content/renderer/webcrypto_impl_nss.cc

Issue 23569007: WebCrypto: Implement importKey() and sign() for HMAC in NSS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Another attempt to fix try errors. Created 7 years, 3 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
« no previous file with comments | « content/renderer/webcrypto_impl.cc ('k') | content/renderer/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_impl_nss.cc
diff --git a/content/renderer/webcrypto_impl_nss.cc b/content/renderer/webcrypto_impl_nss.cc
index 018037c26f597e9144b380d061112c4b15e4b9e7..f3a236e593c53afef9c6f107f7ecc2343a525d03 100644
--- a/content/renderer/webcrypto_impl_nss.cc
+++ b/content/renderer/webcrypto_impl_nss.cc
@@ -4,41 +4,116 @@
#include "content/renderer/webcrypto_impl.h"
+#include <pk11pub.h>
#include <sechash.h>
#include "base/logging.h"
#include "crypto/nss_util.h"
+#include "crypto/scoped_nss_types.h"
#include "third_party/WebKit/public/platform/WebArrayBuffer.h"
#include "third_party/WebKit/public/platform/WebCryptoAlgorithm.h"
+#include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
namespace content {
-bool WebCryptoImpl::DigestInternal(
- const WebKit::WebCryptoAlgorithm& algorithm,
- const unsigned char* data,
- unsigned data_size,
- WebKit::WebArrayBuffer* buffer) {
- HASH_HashType hash_type = HASH_AlgNULL;
+namespace {
+
+class WebCryptoKeyHandleBase : public WebKit::WebCryptoKeyHandle {
+ public:
+ bool Initialize() {
+ slot_.reset(PK11_GetInternalSlot());
+ return slot_.get() != NULL;
+ }
+
+ WebKit::WebCryptoKeyUsageMask usage() { return usage_; }
eroman 2013/09/11 19:42:07 Note that this is a duplication from. What about c
Bryan Eyler 2013/09/11 21:59:16 Done.
+ CK_MECHANISM_TYPE mechanism() const { return mechanism_; }
+ PK11SlotInfo* slot() { return slot_.get(); }
+
+ protected:
+ WebCryptoKeyHandleBase(CK_MECHANISM_TYPE mechanism,
+ WebKit::WebCryptoKeyUsageMask usage)
+ : usage_(usage),
+ mechanism_(mechanism) {
+ }
+
+ WebKit::WebCryptoKeyUsageMask usage_;
+ CK_MECHANISM_TYPE mechanism_;
+ crypto::ScopedPK11Slot slot_;
+};
+
+class WebCryptoSymKeyHandle : public WebCryptoKeyHandleBase {
eroman 2013/09/11 19:42:07 You can drop the "WebCrypto" prefix on these class
Bryan Eyler 2013/09/11 21:59:16 Done.
+ public:
+ WebCryptoSymKeyHandle(CK_MECHANISM_TYPE mechanism,
+ WebKit::WebCryptoKeyUsageMask usage)
+ : WebCryptoKeyHandleBase(mechanism, usage) {
+ }
+
+ void set_key(crypto::ScopedPK11SymKey key) {
+ DCHECK(!key_.get());
+ key_ = key.Pass();
+ }
+
+ PK11SymKey* key() { return key_.get(); }
+
+ private:
+ crypto::ScopedPK11SymKey key_;
+
+ DISALLOW_COPY_AND_ASSIGN(WebCryptoSymKeyHandle);
+};
+CK_FLAGS WebCryptoKeyUsageMaskToNSSFlags(
+ WebKit::WebCryptoKeyUsageMask mask) {
+ return ((mask & WebKit::WebCryptoKeyUsageEncrypt) ? CKF_ENCRYPT : 0) |
+ ((mask & WebKit::WebCryptoKeyUsageDecrypt) ? CKF_DECRYPT : 0) |
+ ((mask & WebKit::WebCryptoKeyUsageSign) ? CKF_SIGN : 0) |
+ ((mask & WebKit::WebCryptoKeyUsageVerify) ? CKF_VERIFY : 0) |
+ ((mask & WebKit::WebCryptoKeyUsageDeriveKey) ? CKF_DERIVE : 0) |
+ ((mask & WebKit::WebCryptoKeyUsageWrapKey) ? CKF_WRAP : 0) |
+ ((mask & WebKit::WebCryptoKeyUsageUnwrapKey) ? CKF_UNWRAP : 0);
+}
+
+HASH_HashType WebCryptoAlgorithmToNSSHashType(
+ const WebKit::WebCryptoAlgorithm& algorithm) {
switch (algorithm.id()) {
case WebKit::WebCryptoAlgorithmIdSha1:
- hash_type = HASH_AlgSHA1;
- break;
+ return HASH_AlgSHA1;
case WebKit::WebCryptoAlgorithmIdSha224:
- hash_type = HASH_AlgSHA224;
- break;
+ return HASH_AlgSHA224;
case WebKit::WebCryptoAlgorithmIdSha256:
- hash_type = HASH_AlgSHA256;
- break;
+ return HASH_AlgSHA256;
case WebKit::WebCryptoAlgorithmIdSha384:
- hash_type = HASH_AlgSHA384;
- break;
+ return HASH_AlgSHA384;
case WebKit::WebCryptoAlgorithmIdSha512:
- hash_type = HASH_AlgSHA512;
- break;
+ return HASH_AlgSHA512;
default:
// Not a digest algorithm.
- return false;
+ return HASH_AlgNULL;
+ }
+}
+
+CK_MECHANISM_TYPE WebCryptoAlgorithmToHMACMechanism(
+ const WebKit::WebCryptoAlgorithm& algorithm) {
+ switch (algorithm.id()) {
+ case WebKit::WebCryptoAlgorithmIdSha1:
+ return CKM_SHA_1_HMAC;
+ case WebKit::WebCryptoAlgorithmIdSha256:
+ return CKM_SHA256_HMAC;
+ default:
+ // Not a supported algorithm.
+ return CKM_INVALID_MECHANISM;
+ }
+}
+
+} // namespace
+
+bool WebCryptoImpl::DigestInternal(
+ const WebKit::WebCryptoAlgorithm& algorithm,
+ const unsigned char* data,
+ unsigned data_size,
+ WebKit::WebArrayBuffer* buffer) {
+ HASH_HashType hash_type = WebCryptoAlgorithmToNSSHashType(algorithm);
+ if (hash_type == HASH_AlgNULL) {
+ return false;
}
crypto::EnsureNSSInit();
@@ -52,14 +127,14 @@ bool WebCryptoImpl::DigestInternal(
HASH_Update(context, data, data_size);
- size_t hash_result_length = HASH_ResultLenContext(context);
+ unsigned hash_result_length = HASH_ResultLenContext(context);
DCHECK_LE(hash_result_length, static_cast<size_t>(HASH_LENGTH_MAX));
*buffer = WebKit::WebArrayBuffer::create(hash_result_length, 1);
unsigned char* digest = reinterpret_cast<unsigned char*>(buffer->data());
- uint32 result_length = 0;
+ unsigned result_length = 0;
HASH_End(context, digest, &result_length, hash_result_length);
HASH_Destroy(context);
@@ -67,4 +142,149 @@ bool WebCryptoImpl::DigestInternal(
return result_length == hash_result_length;
}
+bool WebCryptoImpl::ImportKeyInternal(
+ WebKit::WebCryptoKeyFormat format,
+ const unsigned char* key_data,
+ unsigned key_data_size,
+ const WebKit::WebCryptoAlgorithm& algorithm,
+ WebKit::WebCryptoKeyUsageMask usage_mask,
+ scoped_ptr<WebKit::WebCryptoKeyHandle>* handle,
+ WebKit::WebCryptoKeyType* type) {
+ switch (algorithm.id()) {
+ case WebKit::WebCryptoAlgorithmIdHmac:
+ *type = WebKit::WebCryptoKeyTypeSecret;
+ break;
+ // TODO(bryaneyler): Support more key types.
+ default:
+ return false;
+ }
+
+ // TODO(bryaneyler): Need to split handling for symmetric and asymmetric keys.
+ // Currently only supporting symmetric.
+ scoped_ptr<WebCryptoSymKeyHandle> sym_key;
+
+ crypto::EnsureNSSInit();
+
+ switch(algorithm.id()) {
+ case WebKit::WebCryptoAlgorithmIdHmac: {
+ const WebKit::WebCryptoHmacParams* params = algorithm.hmacParams();
+ if (!params) {
+ return false;
+ }
+
+ CK_MECHANISM_TYPE mechanism =
+ WebCryptoAlgorithmToHMACMechanism(params->hash());
+ if (mechanism == CKM_INVALID_MECHANISM) {
+ return false;
+ }
+
+ sym_key.reset(new WebCryptoSymKeyHandle(mechanism, usage_mask));
+
+ if (!sym_key->Initialize()) {
+ return false;
+ }
+
+ break;
+ }
+ default:
+ return false;
+ }
+
+ SECItem key_item = { siBuffer, NULL, 0 };
+
+ switch (format) {
+ case WebKit::WebCryptoKeyFormatRaw:
+ key_item.data = const_cast<unsigned char*>(key_data);
+ key_item.len = key_data_size;
+ break;
+ // TODO(bryaneyler): Handle additional formats.
+ default:
+ return false;
+ }
+
+ crypto::ScopedPK11SymKey pk11_sym_key(
+ PK11_ImportSymKeyWithFlags(sym_key->slot(),
+ sym_key->mechanism(),
+ PK11_OriginUnwrap,
+ CKA_FLAGS_ONLY,
+ &key_item,
+ WebCryptoKeyUsageMaskToNSSFlags(usage_mask),
+ false,
+ NULL));
+ sym_key->set_key(pk11_sym_key.Pass());
+ if (!sym_key->key()) {
+ NOTREACHED();
+ return false;
+ }
+
+ *handle = sym_key.Pass();
+
+ return true;
+}
+
+bool WebCryptoImpl::SignInternal(
+ const WebKit::WebCryptoAlgorithm& algorithm,
+ const WebKit::WebCryptoKeyHandle* key,
+ const unsigned char* data,
+ unsigned data_size,
+ WebKit::WebArrayBuffer* buffer) {
+ WebKit::WebArrayBuffer result;
+
+ switch (algorithm.id()) {
+ case WebKit::WebCryptoAlgorithmIdHmac: {
+ const WebKit::WebCryptoHmacParams* params = algorithm.hmacParams();
+ if (!params) {
+ return false;
+ }
+
+ WebCryptoSymKeyHandle* sym_key =
+ const_cast<WebCryptoSymKeyHandle*>(
+ reinterpret_cast<const WebCryptoSymKeyHandle*>(key));
+
+ DCHECK_EQ(sym_key->mechanism(),
+ WebCryptoAlgorithmToHMACMechanism(params->hash()));
+ DCHECK_NE(0, sym_key->usage() & WebKit::WebCryptoKeyUsageSign);
+
+ SECItem param_item = { siBuffer, NULL, 0 };
+ SECItem data_item = {
+ siBuffer,
+ const_cast<unsigned char*>(data),
+ data_size
+ };
+ // First call is to figure out the length.
+ SECItem signature_item = { siBuffer, NULL, 0 };
+
+ if (PK11_SignWithSymKey(sym_key->key(),
+ sym_key->mechanism(),
+ &param_item,
+ &signature_item,
+ &data_item) != SECSuccess) {
+ NOTREACHED();
+ return false;
+ }
+
+ DCHECK_LT(0u, signature_item.len);
+
+ result = WebKit::WebArrayBuffer::create(signature_item.len, 1);
+ signature_item.data = reinterpret_cast<unsigned char*>(result.data());
+
+ if (PK11_SignWithSymKey(sym_key->key(),
+ sym_key->mechanism(),
+ &param_item,
+ &signature_item,
+ &data_item) != SECSuccess) {
+ NOTREACHED();
+ return false;
+ }
+
+ break;
+ }
+ default:
+ return false;
+ }
+
+ *buffer = result;
+ return true;
+}
+
} // namespace content
« no previous file with comments | « content/renderer/webcrypto_impl.cc ('k') | content/renderer/webcrypto_impl_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698