OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
353 virtual WebCryptoAlgorithmParamsType type() const | 353 virtual WebCryptoAlgorithmParamsType type() const |
354 { | 354 { |
355 return WebCryptoAlgorithmParamsTypeHkdfParams; | 355 return WebCryptoAlgorithmParamsTypeHkdfParams; |
356 } | 356 } |
357 | 357 |
358 private: | 358 private: |
359 const WebVector<unsigned char> m_salt; | 359 const WebVector<unsigned char> m_salt; |
360 const WebVector<unsigned char> m_info; | 360 const WebVector<unsigned char> m_info; |
361 }; | 361 }; |
362 | 362 |
363 class WebCryptoPbkdf2Params : public WebCryptoAlgorithmParamsWithHash { | |
364 public: | |
365 explicit WebCryptoPbkdf2Params(const WebCryptoAlgorithm& hash, const unsigne d char* salt, | |
eroman
2015/01/14 21:12:22
remove "explicit" (we only use that for single-par
xun.sun
2015/01/15 17:13:29
Done.
| |
366 unsigned saltLength, unsigned long iterations) | |
eroman
2015/01/14 21:12:22
unsigned long --> unsigned int
xun.sun
2015/01/15 17:13:29
Done.
| |
367 : WebCryptoAlgorithmParamsWithHash(hash) | |
368 , m_salt(salt, saltLength) | |
369 , m_iterations(iterations) | |
370 { | |
371 } | |
372 | |
373 virtual WebCryptoAlgorithmParamsType type() const { return WebCryptoAlgorith mParamsTypePbkdf2Params; } | |
374 | |
375 const WebVector<unsigned char>& salt() const { return m_salt; } | |
376 unsigned long iterations() const { return m_iterations; } | |
eroman
2015/01/14 21:12:22
unsigned long --> unsigned int
(unsigned long in
xun.sun
2015/01/15 17:13:29
Done.
| |
377 | |
378 private: | |
379 const WebVector<unsigned char> m_salt; | |
380 const unsigned long m_iterations; | |
eroman
2015/01/14 21:12:22
unsigned int
xun.sun
2015/01/15 17:13:29
Done.
| |
381 }; | |
382 | |
363 } // namespace blink | 383 } // namespace blink |
364 | 384 |
365 #endif | 385 #endif |
OLD | NEW |