| OLD | NEW |
| 1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 * Use of this source code is governed by a BSD-style license that can be | 2 * Use of this source code is governed by a BSD-style license that can be |
| 3 * found in the LICENSE file. | 3 * found in the LICENSE file. |
| 4 */ | 4 */ |
| 5 | 5 |
| 6 /** | 6 /** |
| 7 * The <code>PP_DecryptTrackingInfo</code> struct contains necessary information | 7 * The <code>PP_DecryptTrackingInfo</code> struct contains necessary information |
| 8 * that can be used to associate the decrypted block with a decrypt request | 8 * that can be used to associate the decrypted block with a decrypt request |
| 9 * and/or an input block. | 9 * and/or an input block. |
| 10 */ | 10 */ |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 /** | 69 /** |
| 70 * Size in bytes of encrypted data in a subsample entry. | 70 * Size in bytes of encrypted data in a subsample entry. |
| 71 */ | 71 */ |
| 72 uint32_t cipher_bytes; | 72 uint32_t cipher_bytes; |
| 73 }; | 73 }; |
| 74 | 74 |
| 75 /** | 75 /** |
| 76 * The <code>PP_EncryptedBlockInfo</code> struct contains all the information | 76 * The <code>PP_EncryptedBlockInfo</code> struct contains all the information |
| 77 * needed to decrypt an encrypted block. | 77 * needed to decrypt an encrypted block. |
| 78 */ | 78 */ |
| 79 [assert_size(256)] | 79 [assert_size(240)] |
| 80 struct PP_EncryptedBlockInfo { | 80 struct PP_EncryptedBlockInfo { |
| 81 /** | 81 /** |
| 82 * Information needed by the client to track the block to be decrypted. | 82 * Information needed by the client to track the block to be decrypted. |
| 83 */ | 83 */ |
| 84 PP_DecryptTrackingInfo tracking_info; | 84 PP_DecryptTrackingInfo tracking_info; |
| 85 | 85 |
| 86 /** | 86 /** |
| 87 * Size in bytes of data to be discarded before applying the decryption. | 87 * Size in bytes of data to be discarded before applying the decryption. |
| 88 */ | 88 */ |
| 89 uint32_t data_offset; | 89 uint32_t data_offset; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 100 uint8_t[64] key_id; | 100 uint8_t[64] key_id; |
| 101 uint32_t key_id_size; | 101 uint32_t key_id_size; |
| 102 | 102 |
| 103 /** | 103 /** |
| 104 * Initialization vector of the block to be decrypted. | 104 * Initialization vector of the block to be decrypted. |
| 105 */ | 105 */ |
| 106 uint8_t[16] iv; | 106 uint8_t[16] iv; |
| 107 uint32_t iv_size; | 107 uint32_t iv_size; |
| 108 | 108 |
| 109 /** | 109 /** |
| 110 * Checksum of the block to be decrypted. | |
| 111 */ | |
| 112 uint8_t[12] checksum; | |
| 113 uint32_t checksum_size; | |
| 114 | |
| 115 /** | |
| 116 * Subsample information of the block to be decrypted. | 110 * Subsample information of the block to be decrypted. |
| 117 */ | 111 */ |
| 118 PP_DecryptSubsampleDescription[16] subsamples; | 112 PP_DecryptSubsampleDescription[16] subsamples; |
| 119 uint32_t num_subsamples; | 113 uint32_t num_subsamples; |
| 120 }; | 114 }; |
| 121 | 115 |
| 122 /** | 116 /** |
| 123 * The <code>PP_DecryptResult</code> enum contains decryption and decoding | 117 * The <code>PP_DecryptResult</code> enum contains decryption and decoding |
| 124 * result constants. | 118 * result constants. |
| 125 */ | 119 */ |
| (...skipping 24 matching lines...) Expand all Loading... |
| 150 * Result of the decryption (and/or decoding) operation. | 144 * Result of the decryption (and/or decoding) operation. |
| 151 */ | 145 */ |
| 152 PP_DecryptResult result; | 146 PP_DecryptResult result; |
| 153 | 147 |
| 154 /** | 148 /** |
| 155 * 4-byte padding to make the size of <code>PP_DecryptedBlockInfo</code> | 149 * 4-byte padding to make the size of <code>PP_DecryptedBlockInfo</code> |
| 156 * a multiple of 8 bytes. The value of this field should not be used. | 150 * a multiple of 8 bytes. The value of this field should not be used. |
| 157 */ | 151 */ |
| 158 uint32_t padding; | 152 uint32_t padding; |
| 159 }; | 153 }; |
| OLD | NEW |