| 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 26 matching lines...) Expand all Loading... |
| 37 | 37 |
| 38 Algorithm* HmacKeyParams::hash() | 38 Algorithm* HmacKeyParams::hash() |
| 39 { | 39 { |
| 40 if (!m_hash) | 40 if (!m_hash) |
| 41 m_hash = Algorithm::create(m_algorithm.hmacKeyParams()->hash()); | 41 m_hash = Algorithm::create(m_algorithm.hmacKeyParams()->hash()); |
| 42 return m_hash.get(); | 42 return m_hash.get(); |
| 43 } | 43 } |
| 44 | 44 |
| 45 unsigned HmacKeyParams::length(bool& isNull) | 45 unsigned HmacKeyParams::length(bool& isNull) |
| 46 { | 46 { |
| 47 unsigned length = 0; | 47 isNull = !m_algorithm.hmacKeyParams()->hasLengthBytes(); |
| 48 isNull = !m_algorithm.hmacKeyParams()->getLength(length); | 48 return m_algorithm.hmacKeyParams()->optionalLengthBytes(); |
| 49 return length; | |
| 50 } | 49 } |
| 51 | 50 |
| 52 HmacKeyParams::HmacKeyParams(const blink::WebCryptoAlgorithm& algorithm) | 51 HmacKeyParams::HmacKeyParams(const blink::WebCryptoAlgorithm& algorithm) |
| 53 : Algorithm(algorithm) | 52 : Algorithm(algorithm) |
| 54 { | 53 { |
| 55 ASSERT(algorithm.hmacKeyParams()); | 54 ASSERT(algorithm.hmacKeyParams()); |
| 56 ScriptWrappable::init(this); | 55 ScriptWrappable::init(this); |
| 57 } | 56 } |
| 58 | 57 |
| 59 } // namespace WebCore | 58 } // namespace WebCore |
| OLD | NEW |