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

Side by Side Diff: ppapi/api/private/pp_content_decryptor.idl

Issue 2514123004: Fix range checking for PP_CdmKeyStatus (Closed)
Patch Set: add _MAX values Created 4 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
« no previous file with comments | « no previous file | ppapi/c/private/pp_content_decryptor.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 /* 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 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 PP_DECRYPTORSTREAMTYPE_VIDEO = 1 405 PP_DECRYPTORSTREAMTYPE_VIDEO = 1
406 }; 406 };
407 407
408 /** 408 /**
409 * <code>PP_SessionType</code> contains session type constants. 409 * <code>PP_SessionType</code> contains session type constants.
410 */ 410 */
411 [assert_size(4)] 411 [assert_size(4)]
412 enum PP_SessionType { 412 enum PP_SessionType {
413 PP_SESSIONTYPE_TEMPORARY = 0, 413 PP_SESSIONTYPE_TEMPORARY = 0,
414 PP_SESSIONTYPE_PERSISTENT_LICENSE = 1, 414 PP_SESSIONTYPE_PERSISTENT_LICENSE = 1,
415 PP_SESSIONTYPE_PERSISTENT_RELEASE = 2 415 PP_SESSIONTYPE_PERSISTENT_RELEASE = 2
xhwang 2016/11/21 19:35:18 Can we fix this, as well as others in this file th
jrummell 2016/11/21 20:06:35 Done.
416 }; 416 };
417 417
418 /** 418 /**
419 * <code>PP_InitDataType</code> contains Initialization Data Type constants. 419 * <code>PP_InitDataType</code> contains Initialization Data Type constants.
420 */ 420 */
421 [assert_size(4)] 421 [assert_size(4)]
422 enum PP_InitDataType { 422 enum PP_InitDataType {
423 PP_INITDATATYPE_CENC = 0, 423 PP_INITDATATYPE_CENC = 0,
424 PP_INITDATATYPE_KEYIDS = 1, 424 PP_INITDATATYPE_KEYIDS = 1,
425 PP_INITDATATYPE_WEBM = 2 425 PP_INITDATATYPE_WEBM = 2
426 }; 426 };
427 427
428 /** 428 /**
429 * <code>PP_CdmExceptionCode</code> contains exception code constants. 429 * <code>PP_CdmExceptionCode</code> contains exception code constants.
430 */ 430 */
431 [assert_size(4)] 431 [assert_size(4)]
432 enum PP_CdmExceptionCode { 432 enum PP_CdmExceptionCode {
433 PP_CDMEXCEPTIONCODE_NOTSUPPORTEDERROR = 1, 433 PP_CDMEXCEPTIONCODE_NOTSUPPORTEDERROR = 1,
434 PP_CDMEXCEPTIONCODE_INVALIDSTATEERROR = 2, 434 PP_CDMEXCEPTIONCODE_INVALIDSTATEERROR = 2,
435 PP_CDMEXCEPTIONCODE_INVALIDACCESSERROR = 3, 435 PP_CDMEXCEPTIONCODE_INVALIDACCESSERROR = 3,
436 PP_CDMEXCEPTIONCODE_QUOTAEXCEEDEDERROR = 4, 436 PP_CDMEXCEPTIONCODE_QUOTAEXCEEDEDERROR = 4,
437 PP_CDMEXCEPTIONCODE_UNKNOWNERROR = 5, 437 PP_CDMEXCEPTIONCODE_UNKNOWNERROR = 5,
438 PP_CDMEXCEPTIONCODE_CLIENTERROR = 6, 438 PP_CDMEXCEPTIONCODE_CLIENTERROR = 6,
439 PP_CDMEXCEPTIONCODE_OUTPUTERROR = 7 439 PP_CDMEXCEPTIONCODE_OUTPUTERROR = 7,
440 PP_CDMEXCEPTIONCODE_MAX = PP_CDMEXCEPTIONCODE_OUTPUTERROR
440 }; 441 };
441 442
442 /** 443 /**
443 * <code>PP_CdmMessageType</code> contains message type constants. 444 * <code>PP_CdmMessageType</code> contains message type constants.
444 */ 445 */
445 [assert_size(4)] 446 [assert_size(4)]
446 enum PP_CdmMessageType { 447 enum PP_CdmMessageType {
447 PP_CDMMESSAGETYPE_LICENSE_REQUEST = 0, 448 PP_CDMMESSAGETYPE_LICENSE_REQUEST = 0,
448 PP_CDMMESSAGETYPE_LICENSE_RENEWAL = 1, 449 PP_CDMMESSAGETYPE_LICENSE_RENEWAL = 1,
449 PP_CDMMESSAGETYPE_LICENSE_RELEASE = 2 450 PP_CDMMESSAGETYPE_LICENSE_RELEASE = 2,
451 PP_CDMMESSAGETYPE_MAX = PP_CDMMESSAGETYPE_LICENSE_RELEASE
450 }; 452 };
451 453
452 /** 454 /**
453 * <code>PP_CdmKeyStatus</code> contains key status constants. 455 * <code>PP_CdmKeyStatus</code> contains key status constants.
454 */ 456 */
455 [assert_size(4)] 457 [assert_size(4)]
456 enum PP_CdmKeyStatus { 458 enum PP_CdmKeyStatus {
457 PP_CDMKEYSTATUS_USABLE = 0, 459 PP_CDMKEYSTATUS_USABLE = 0,
458 PP_CDMKEYSTATUS_INVALID = 1, 460 PP_CDMKEYSTATUS_INVALID = 1,
459 PP_CDMKEYSTATUS_EXPIRED = 2, 461 PP_CDMKEYSTATUS_EXPIRED = 2,
460 PP_CDMKEYSTATUS_OUTPUTRESTRICTED = 3, 462 PP_CDMKEYSTATUS_OUTPUTRESTRICTED = 3,
461 PP_CDMKEYSTATUS_OUTPUTDOWNSCALED = 4, 463 PP_CDMKEYSTATUS_OUTPUTDOWNSCALED = 4,
462 PP_CDMKEYSTATUS_STATUSPENDING = 5, 464 PP_CDMKEYSTATUS_STATUSPENDING = 5,
463 PP_CDMKEYSTATUS_RELEASED = 6 465 PP_CDMKEYSTATUS_RELEASED = 6,
466 PP_CDMKEYSTATUS_MAX = PP_CDMKEYSTATUS_RELEASED
464 }; 467 };
465 468
466 /** 469 /**
467 * The <code>PP_KeyInformation</code> struct contains information about a 470 * The <code>PP_KeyInformation</code> struct contains information about a
468 * key used for decryption. 471 * key used for decryption.
469 */ 472 */
470 [assert_size(524)] 473 [assert_size(524)]
471 struct PP_KeyInformation { 474 struct PP_KeyInformation {
472 /** 475 /**
473 * Key ID. 476 * Key ID.
474 */ 477 */
475 uint8_t[512] key_id; 478 uint8_t[512] key_id;
476 uint32_t key_id_size; 479 uint32_t key_id_size;
477 480
478 /** 481 /**
479 * Status of this key. 482 * Status of this key.
480 */ 483 */
481 PP_CdmKeyStatus key_status; 484 PP_CdmKeyStatus key_status;
482 485
483 /** 486 /**
484 * Optional error code for keys that are not usable. 487 * Optional error code for keys that are not usable.
485 */ 488 */
486 uint32_t system_code; 489 uint32_t system_code;
487 }; 490 };
OLDNEW
« no previous file with comments | « no previous file | ppapi/c/private/pp_content_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698