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

Side by Side Diff: Source/modules/crypto/Crypto.cpp

Issue 87963002: Improve Crypto::getRandomValues exception messages. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: DEBUG. 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/bindings/v8/custom/V8CryptoCustom.cpp ('k') | Source/wtf/ArrayBufferView.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 } 54 }
55 55
56 Crypto::Crypto() 56 Crypto::Crypto()
57 { 57 {
58 ScriptWrappable::init(this); 58 ScriptWrappable::init(this);
59 } 59 }
60 60
61 // Note: This implementation must be thread-safe, as it is used by workers. 61 // Note: This implementation must be thread-safe, as it is used by workers.
62 void Crypto::getRandomValues(ArrayBufferView* array, ExceptionState& exceptionSt ate) 62 void Crypto::getRandomValues(ArrayBufferView* array, ExceptionState& exceptionSt ate)
63 { 63 {
64 if (!array || !isIntegerArray(array)) { 64 if (!array) {
65 exceptionState.throwUninformativeAndGenericDOMException(TypeMismatchErro r); 65 exceptionState.throwDOMException(TypeMismatchError, "The provided ArrayB ufferView is null.");
66 return;
67 }
68 if (!isIntegerArray(array)) {
69 exceptionState.throwDOMException(TypeMismatchError, String::format("The provided ArrayBufferView is of type '%s', which is not an integer array type.", array->typeName()));
66 return; 70 return;
67 } 71 }
68 if (array->byteLength() > 65536) { 72 if (array->byteLength() > 65536) {
69 exceptionState.throwUninformativeAndGenericDOMException(QuotaExceededErr or); 73 exceptionState.throwDOMException(QuotaExceededError, String::format("The ArrayBufferView's byte length (%u) exceeds the number of bytes of entropy avail able via this API (65536).", array->byteLength()));
70 return; 74 return;
71 } 75 }
72 cryptographicallyRandomValues(array->baseAddress(), array->byteLength()); 76 cryptographicallyRandomValues(array->baseAddress(), array->byteLength());
73 } 77 }
74 78
75 SubtleCrypto* Crypto::subtle() 79 SubtleCrypto* Crypto::subtle()
76 { 80 {
77 if (!m_subtleCrypto) 81 if (!m_subtleCrypto)
78 m_subtleCrypto = SubtleCrypto::create(); 82 m_subtleCrypto = SubtleCrypto::create();
79 return m_subtleCrypto.get(); 83 return m_subtleCrypto.get();
80 } 84 }
81 85
82 } 86 }
OLDNEW
« no previous file with comments | « Source/bindings/v8/custom/V8CryptoCustom.cpp ('k') | Source/wtf/ArrayBufferView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698